add new charset, from MySQL 5.6

diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index a36bb11e92b9416ba538d04fd39a7a9c7b702b63..8766a4b25dfb89181b3d76fc0e8a60917314b97d 100644 (file)
--- 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;
 }
 /* }}} */