From: Ulf Wendel <uw@php.net>
Date: Fri, 2 Sep 2011 09:27:23 +0000 (+0000)
Subject: MySQL 5.6 update
X-Git-Tag: php-5.5.0alpha1~1377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e5d9ae1dd8e86b4718cc4041e775c4501ff99eb;p=php

MySQL 5.6 update
---

diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index 191a163f24..1bfe9cbdaa 100644
--- 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 4cd6e6ec1d..38fe56841b 100644
--- 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(); */