[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_charset.c

2009-05-26 Thread Andrey Hristov 
andrey  Tue May 26 13:41:19 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_charset.c 
  Log:
  Fix a typo, utf8 is 3 byte max, for us, for now
  Add a another cset
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_charset.c?r1=1.2.2.10&r2=1.2.2.11&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_charset.c
diff -u php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.10 
php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.11
--- php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.10  Fri Feb 20 13:25:12 2009
+++ php-src/ext/mysqlnd/mysqlnd_charset.c   Tue May 26 13:41:18 2009
@@ -404,6 +404,7 @@
{ 144, "ucs2", "ucs2_persian_ci", 2, 2, "", mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 145, "ucs2", "ucs2_esperanto_ci", 2, 2, "", mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 146, "ucs2", "ucs2_hungarian_ci", 2, 2, "", mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
+   { 147, "ucs2", "ucs2_sinhala_ci", 2, 2, "", mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
{ 192, "utf8", "utf8_general_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
{ 193, "utf8", "utf8_icelandic_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
{ 194, "utf8", "utf8_latvian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8,  
check_mb_utf8_valid},
@@ -423,7 +424,7 @@
{ 208, "utf8", "utf8_persian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
{ 209, "utf8", "utf8_esperanto_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
{ 210, "utf8", "utf8_hungarian_ci", 1, 3, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
-   { 254, "utf8", "utf8_general_cs", 1, 2, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
+   { 254, "utf8", "utf8_general_cs", 1, 3, "", mysqlnd_mbcharlen_utf8, 
check_mb_utf8_valid},
{   0, NULL, NULL, 0, 0, NULL, NULL, NULL}
 };
 /* }}} */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_charset.c

2009-02-20 Thread Andrey Hristov 
andrey  Fri Feb 20 13:25:12 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_charset.c 
  Log:
  MFH: Add charsets from MySQL 6.0 as a structure to be used later
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_charset.c?r1=1.2.2.9&r2=1.2.2.10&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_charset.c
diff -u php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.9 
php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.10
--- php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.9   Wed Dec 31 11:15:39 2008
+++ php-src/ext/mysqlnd/mysqlnd_charset.c   Fri Feb 20 13:25:12 2009
@@ -429,6 +429,165 @@
 /* }}} */
 
 
+/* {{{ mysqlnd_charsets */
+const MYSQLND_CHARSET mysqlnd_charsets60[] =
+{
+   {   1, "big5","big5_chinese_ci", 1, 2, "", mysqlnd_mbcharlen_big5, 
check_mb_big5},
+   {   3, "dec8", "dec8_swedisch_ci", 1, 1, "", NULL, NULL},
+   {   4, "cp850", "cp850_general_ci", 1, 1, "", NULL, NULL},
+   {   6, "hp8", "hp8_english_ci", 1, 1, "", NULL, NULL},
+   {   7, "koi8r", "koi8r_general_ci", 1, 1, "", NULL, NULL},
+   {   8, "latin1", "latin1_swedish_ci", 1, 1, "", NULL, NULL},
+   {   9, "latin2", "latin2_general_ci", 1, 1, "", NULL, NULL},
+   {  10, "swe7", "swe7_swedish_ci", 1, 1, "", NULL, NULL},
+   {  11, "ascii", "ascii_general_ci", 1, 1, "", NULL, NULL},
+   {  12, "ujis", "ujis_japanese_ci", 1, 3, "", mysqlnd_mbcharlen_ujis, 
check_mb_ujis},
+   {  13, "sjis", "sjis_japanese_ci", 1, 2, "", mysqlnd_mbcharlen_sjis, 
check_mb_sjis},
+   {  16, "hebrew", "hebrew_general_ci", 1, 1, "", NULL, NULL},
+   {  18, "tis620", "tis620_thai_ci", 1, 1, "", NULL, NULL},
+   {  19, "euckr", "euckr_korean_ci", 1, 2, "", mysqlnd_mbcharlen_euckr, 
check_mb_euckr},
+   {  22, "koi8u", "koi8u_general_ci", 1, 1, "", NULL, NULL},
+   {  24, "gb2312", "gb2312_chinese_ci", 1, 2, "", 
mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
+   {  25, "greek", "greek_general_ci", 1, 1, "", NULL, NULL},  
+   {  26, "cp1250", "cp1250_general_ci", 1, 1, "", NULL, NULL},
+   {  28, "gbk", "gbk_chinese_ci", 1, 2, "", mysqlnd_mbcharlen_gbk, 
check_mb_gbk},
+   {  30, "latin5", "latin5_turkish_ci", 1, 1, "", NULL, NULL},
+   {  32, "armscii8", "armscii8_general_ci", 1, 1, "", NULL, NULL},
+   {  33, "utf8", "utf8_general_ci", 1, 2, "UTF-8 Unicode", 
mysqlnd_mbcharlen_utf8,  check_mb_utf8_valid},
+   {  35, "ucs2", "ucs2_general_ci", 2, 2, "UCS-2 Unicode", 
mysqlnd_mbcharlen_ucs2, check_mb_ucs2},
+   {  36, "cp866", "cp866_general_ci", 1, 1, "", NULL, NULL},
+   {  37, "keybcs2", "keybcs2_general_ci", 1, 1, "", NULL, NULL},
+   {  38, "macce", "macce_general_ci", 1, 1, "", NULL, NULL},
+   {  39, "macroman", "macroman_general_ci", 1, 1, "", NULL, NULL},
+   {  40, "cp852", "cp852_general_ci", 1, 1, "", NULL, NULL},
+   {  41, "latin7", "latin7_general_ci", 1, 1, "", NULL, NULL},
+   {  51, "cp1251", "cp1251_general_ci", 1, 1, "", NULL, NULL},
+   {  57, "cp1256", "cp1256_general_ci", 1, 1, "", NULL, NULL},
+   {  59, "cp1257", "cp1257_general_ci", 1, 1, "", NULL, NULL},
+   {  63, "binary", "binary", 1, 1, "", NULL, NULL},
+   {  92, "geostd8", "geostd8_general_ci", 1, 1, "", NULL, NULL},
+   {  95, "cp932", "cp932_japanese_ci", 1, 2, "", mysqlnd_mbcharlen_cp932, 
check_mb_cp932},
+   {  97, "eucjpms", "eucjpms_japanese_ci", 1, 3, "", 
mysqlnd_mbcharlen_eucjpms, check_mb_eucjpms},
+   {   2, "latin2", "latin2_czech_cs", 1, 1, "", NULL, NULL},
+   {   5, "latin1", "latin1_german_ci", 1, 1, "", NULL, NULL},
+   {  14, "cp1251", "cp1251_bulgarian_ci", 1, 1, "", NULL, NULL},
+   {  15, "latin1", "latin1_danish_ci", 1, 1, "", NULL, NULL},
+   {  17, "filename", "filename", 1, 5, "", NULL, NULL},
+   {  20, "latin7", "latin7_estonian_cs", 1, 1, "", NULL, NULL},
+   {  21, "latin2", "latin2_hungarian_ci", 1, 1, "", NULL, NULL},
+   {  23, "cp1251", "cp1251_ukrainian_ci", 1, 1, "", NULL, NULL},
+   {  27, "latin2", "latin2_croatian_ci", 1, 1, "", NULL, NULL},
+   {  29, "cp1257", "cp1257_lithunian_ci", 1, 1, "", NULL, NULL},
+   {  31, "latin1", "latin1_german2_ci", 1, 1, "", NULL, NULL},
+   {  34, "cp1250", "cp1250_czech_cs", 1, 1, "", NULL, NULL},
+   {  42, "latin7", "latin7_general_cs", 1, 1, "", NULL, NULL},
+   {  43, "macce", "macce_bin", 1, 1, "", NULL, NULL},
+   {  44, "cp1250", "cp1250_croatian_ci", 1, 1, "", NULL, NULL},
+   {  47, "latin1", "latin1_bin", 1, 1, "", NULL, NULL},
+   {  48, "latin1", "latin1_general_ci", 1, 1, "", NULL, NULL},
+   {  49, "latin1", "latin1_general_cs", 1, 1, "", NULL, NULL},
+   {  50, "cp1251", "cp1251_bin", 1, 1, "", NULL, NULL},
+   {  52, "cp1251", "cp1251_general_cs", 1, 1, "", NULL, NULL},
+   {  53, "macroman", "macroman_bin", 1, 1, "", NULL, NULL},
+   {  58, "cp1257", "cp1257_bin", 1, 1, "", NULL, NULL},
+   {  60

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mysqlnd mysqlnd_charset.c mysqlnd_structs.h

2008-01-03 Thread Andrey Hristov 
andrey  Thu Jan  3 11:37:33 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mysqlndmysqlnd_charset.c mysqlnd_structs.h 
  Log:
  Remove unused field
  
  http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_charset.c?r1=1.2.2.3&r2=1.2.2.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_charset.c
diff -u php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.3 
php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.4
--- php-src/ext/mysqlnd/mysqlnd_charset.c:1.2.2.3   Mon Dec 31 07:17:10 2007
+++ php-src/ext/mysqlnd/mysqlnd_charset.c   Thu Jan  3 11:37:33 2008
@@ -295,136 +295,136 @@
 /* {{{ mysqlnd_charsets */
 const MYSQLND_CHARSET mysqlnd_charsets[] =
 {
-   {   1, "big5","big5_chinese_ci", 1, 2, 0, mysqlnd_mbcharlen_big5, 
check_mb_big5},
-   {   3, "dec8", "dec8_swedisch_ci", 1, 1, 0, NULL, NULL},
-   {   4, "cp850", "cp850_general_ci", 1, 1, 0, NULL, NULL},
-   {   6, "hp8", "hp8_english_ci", 1, 1, 0, NULL, NULL},
-   {   7, "koi8r", "koi8r_general_ci", 1, 1, 0, NULL, NULL},
-   {   8, "latin1", "latin1_swedish_ci", 1, 1, 0, NULL, NULL},
-   {   9, "latin2", "latin2_general_ci", 1, 1, 0, NULL, NULL},
-   {  10, "swe7", "swe7_swedish_ci", 1, 1, 0, NULL, NULL},
-   {  11, "ascii", "ascii_general_ci", 1, 1, 0, NULL, NULL},
-   {  12, "ujis", "ujis_japanese_ci", 1, 3, 0, mysqlnd_mbcharlen_ujis, 
check_mb_ujis},
-   {  13, "sjis", "sjis_japanese_ci", 1, 2, 0, mysqlnd_mbcharlen_sjis, 
check_mb_sjis},
-   {  16, "hebrew", "hebrew_general_ci", 1, 1, 0, NULL, NULL},
-   {  18, "tis620", "tis620_thai_ci", 1, 1, 0, NULL, NULL},
-   {  19, "euckr", "euckr_korean_ci", 1, 2, 0, mysqlnd_mbcharlen_euckr, 
check_mb_euckr},
-   {  22, "koi8u", "koi8u_general_ci", 1, 1, 0, NULL, NULL},
-   {  24, "gb2312", "gb2312_chinese_ci", 1, 2, 0, 
mysqlnd_mbcharlen_gb2312, check_mb_gb2312},
-   {  25, "greek", "greek_general_ci", 1, 1, 0, NULL, NULL},   
-   {  26, "cp1250", "cp1250_general_ci", 1, 1, 0, NULL, NULL},
-   {  28, "gbk", "gbk_chinese_ci", 1, 2, 0, mysqlnd_mbcharlen_gbk, 
check_mb_gbk},
-   {  30, "latin5", "latin5_turkish_ci", 1, 1, 0, NULL, NULL},
-   {  32, "armscii8", "armscii8_general_ci", 1, 1, 0, NULL, NULL},
-   {  33, "utf8", "utf8_general_ci", 1, 2, 0, mysqlnd_mbcharlen_utf8,  
check_mb_utf8_valid},
-   {  35, "ucs2", "ucs2_general_ci", 2, 2, 0, mysqlnd_mbcharlen_ucs2, 
check_mb_ucs2},
-   {  36, "cp866", "cp866_general_ci", 1, 1, 0, NULL, NULL},
-   {  37, "keybcs2", "keybcs2_general_ci", 1, 1, 0, NULL, NULL},
-   {  38, "macce", "macce_general_ci", 1, 1, 0, NULL, NULL},
-   {  39, "macroman", "macroman_general_ci", 1, 1, 0, NULL, NULL},
-   {  40, "cp852", "cp852_general_ci", 1, 1, 0, NULL, NULL},
-   {  41, "latin7", "latin7_general_ci", 1, 1, 0, NULL, NULL},
-   {  51, "cp1251", "cp1251_general_ci", 1, 1, 0, NULL, NULL},
-   {  57, "cp1256", "cp1256_general_ci", 1, 1, 0, NULL, NULL},
-   {  59, "cp1257", "cp1257_general_ci", 1, 1, 0, NULL, NULL},
-   {  63, "binary", "binary", 1, 1, 0, NULL, NULL},
-   {  92, "geostd8", "geostd8_general_ci", 1, 1, 0, NULL, NULL},
-   {  95, "cp932", "cp932_japanese_ci", 1, 2, 1, mysqlnd_mbcharlen_cp932, 
check_mb_cp932},
-   {  97, "eucjpms", "eucjpms_japanese_ci", 1, 3, 0, 
mysqlnd_mbcharlen_eucjpms, check_mb_eucjpms},
-   {   2, "latin2", "latin2_czech_cs", 1, 1, 0, NULL, NULL},
-   {   5, "latin1", "latin1_german_ci", 1, 1, 0, NULL, NULL},
-   {  14, "cp1251", "cp1251_bulgarian_ci", 1, 1, 0, NULL, NULL},
-   {  15, "latin1", "latin1_danish_ci", 1, 1, 0, NULL, NULL},
-   {  17, "filename", "filename", 1, 5, 1, NULL, NULL},
-   {  20, "latin7", "latin7_estonian_cs", 1, 1, 0, NULL, NULL},
-   {  21, "latin2", "latin2_hungarian_ci", 1, 1, 0, NULL, NULL},
-   {  23, "cp1251", "cp1251_ukrainian_ci", 1, 1, 0, NULL, NULL},
-   {  27, "latin2", "latin2_croatian_ci", 1, 1, 0, NULL, NULL},
-   {  29, "cp1257", "cp1257_lithunian_ci", 1, 1, 0, NULL, NULL},
-   {  31, "latin1", "latin1_german2_ci", 1, 1, 0, NULL, NULL},
-   {  34, "cp1250", "cp1250_czech_cs", 1, 1, 0, NULL, NULL},
-   {  42, "latin7", "latin7_general_cs", 1, 1, 0, NULL, NULL},
-   {  43, "macce", "macce_bin", 1, 1, 0, NULL, NULL},
-   {  44, "cp1250", "cp1250_croatian_ci", 1, 1, 0, NULL, NULL},
-   {  47, "latin1", "latin1_bin", 1, 1, 0, NULL, NULL},
-   {  48, "latin1", "latin1_general_ci", 1, 1, 0, NULL, NULL},
-   {  49, "latin1", "latin1_general_cs", 1, 1, 0, NULL, NULL},
-   {  50, "cp1251", "cp1251_bin", 1, 1, 0, NULL, NULL},
-   {  52, "cp1251", "cp1251_general_cs", 1, 1, 0, NULL, NULL},
-   {  53, "macroman", "macroman_bin", 1, 1, 0, NULL, NULL},
-   {  58, "cp1257", "cp1257_bin", 1, 1, 0, NULL, NULL},
-   {  60, "armascii8", "armascii8_bin", 1, 1, 0, NULL, NULL},
-   {  65, "ascii", "ascii_bin", 1, 1, 0, NULL, NULL},
-   {  66,