MySQL 5.6 update

diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index 191a163f247b65f0686574bfe238f3fbf85e6e42..1bfe9cbdaa06c9c74746df84999c4206aa7282fc 100644 (file)
--- a/ext/mysqli/tests/mysqli_character_set.phpt
+++ b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -48,7 +48,8 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
                $k = $charset['Charset'];
                /* The server currently 17.07.2007 can't handle data sent in ucs2 */
                /* The server currently 16.08.2010 can't handle data sent in utf16 and utf32 */
-               if ($charset['Charset'] == 'ucs2' || $charset['Charset'] == 'utf16' || $charset['Charset'] == 'utf32') {
+               /* The server currently 02.09.2011 can't handle data sent in utf16le */
+               if ($charset['Charset'] == 'ucs2' || $charset['Charset'] == 'utf16' || $charset['Charset'] == 'utf32' || 'utf16le' == $charset['Charset']) {
                        continue;
                }
 

diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt
index 4cd6e6ec1d110f24fd298b7257ae39d199be89d8..38fe56841bf6614f9e4f2e878163ced40b048ac2 100644 (file)
--- a/ext/mysqli/tests/mysqli_set_charset.phpt
+++ b/ext/mysqli/tests/mysqli_set_charset.phpt
@@ -102,7 +102,7 @@ if ((($res = mysqli_query($link, 'SHOW CHARACTER SET LIKE "latin1"', MYSQLI_STOR
                printf("[016] Cannot get list of character sets\n");
 
        while ($tmp = mysqli_fetch_assoc($res)) {
-               if ('ucs2' == $tmp['Charset'] || 'utf16' == $tmp['Charset'] || 'utf32' == $tmp['Charset'])
+               if ('ucs2' == $tmp['Charset'] || 'utf16' == $tmp['Charset'] || 'utf32' == $tmp['Charset'] || 'utf16le' == $tmp['Charset'])
                        continue;
 
                /* Uncomment to see where it hangs - var_dump($tmp); flush(); */