com php-src: add new charset, from MySQL 5.6: ext/mysqlnd/mysql nd_charset.c
| From: | Andrey Hristov | Date: | Fri, 01 Feb 2013 16:21:50 +0000 |
| Subject: | com php-src: add new charset, from MySQL 5.6: ext/mysqlnd/mysql nd_charset.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71159@lists.php.net to get a copy of this message | ||
Commit: f45a85c3861325c0ec5f5f5f7af01e4de1545189
Author: Andrey Hristov <andrey@php.net> Fri, 1 Feb 2013 17:21:50 +0100
Parents: 9d75bf35e96bfc5c8d629ecef6807a90b4c98be7
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f45a85c3861325c0ec5f5f5f7af01e4de1545189
Log:
add new charset, from MySQL 5.6
Changed paths:
M ext/mysqlnd/mysqlnd_charset.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index a36bb11..8766a4b 100644
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -504,12 +504,14 @@ const MYSQLND_CHARSET mysqlnd_charsets[] =
{ 53, "macroman", "macroman_bin", 1, 1, "", NULL, NULL},
{ 54, "utf16", "utf16_general_ci", 2, 4, "UTF-16 Unicode",
mysqlnd_mbcharlen_utf16, check_mb_utf16},
{ 55, "utf16", "utf16_bin", 2, 4, "UTF-16 Unicode",
mysqlnd_mbcharlen_utf16, check_mb_utf16},
+ { 56, "utf16le", "utf16le_general_ci", 2, 4, "UTF-16LE Unicode",
mysqlnd_mbcharlen_utf16, check_mb_utf16},
{ 58, "cp1257", "cp1257_bin", 1, 1, "", NULL, NULL},
#ifdef USED_TO_BE_SO_BEFORE_MYSQL_5_5
{ 60, "armascii8", "armascii8_bin", 1, 1, "", NULL, NULL},
#endif
/*55*/{ 60, "utf32", "utf32_general_ci", 4, 4, "UTF-32 Unicode",
mysqlnd_mbcharlen_utf32, check_mb_utf32},
/*55*/{ 61, "utf32", "utf32_bin", 4, 4, "UTF-32 Unicode",
mysqlnd_mbcharlen_utf32, check_mb_utf32},
+ { 62, "utf16le", "utf16le_bin", 2, 4, "UTF-16LE Unicode",
mysqlnd_mbcharlen_utf16, check_mb_utf16},
{ 65, "ascii", "ascii_bin", 1, 1, "", NULL, NULL},
{ 66, "cp1250", "cp1250_bin", 1, 1, "", NULL, NULL},
{ 67, "cp1256", "cp1256_bin", 1, 1, "", NULL, NULL},
@@ -669,14 +671,15 @@ PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_nr(unsigned int charsetnr)
/* {{{ mysqlnd_find_charset_name */
PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const name)
{
- const MYSQLND_CHARSET * c = mysqlnd_charsets;
-
- do {
- if (!strcasecmp(c->name, name)) {
- return c;
- }
- ++c;
- } while (c[0].nr != 0);
+ if (name) {
+ const MYSQLND_CHARSET * c = mysqlnd_charsets;
+ do {
+ if (!strcasecmp(c->name, name)) {
+ return c;
+ }
+ ++c;
+ } while (c[0].nr != 0);
+ }
return NULL;
}
/* }}} */