Added utf16 and utf32 support, as in MySQL 5.5, in mysqlnd.

faizshukri · faizshukri · commit 277c7d4deaba · 2010-08-16T17:44:50.000Z
Fixed tests, so they don't try to use SET NAMES utf16|utf32,
as character_set_client can't be set to those (the lexer can't
read ucs2, utf16 and utf32).
Added support for 4-byte utf8, as found in MySQL 5.5
diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -47,7 +47,8 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
 	foreach ($charsets as $charset) {
 		$k = $charset['Charset'];
 		/* The server currently 17.07.2007 can't handle data sent in ucs2 */
-		if ($charset['Charset'] == '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') {
 			continue;
 		}
 
diff --git 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'])
+		if ('ucs2' == $tmp['Charset'] || 'utf16' == $tmp['Charset'] || 'utf32' == $tmp['Charset'])
 			continue;
 
 		/* Uncomment to see where it hangs - var_dump($tmp); flush(); */
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {`
`47`	`47`	`foreach ($charsets as $charset) {`
`48`	`48`	`$k = $charset['Charset'];`
`49`	`49`	`/* The server currently 17.07.2007 can't handle data sent in ucs2 */`
`50`		`- if ($charset['Charset'] == 'ucs2') {`
	`50`	`+ /* The server currently 16.08.2010 can't handle data sent in utf16 and utf32 */`
	`51`	`+ if ($charset['Charset'] == 'ucs2' \|\| $charset['Charset'] == 'utf16' \|\| $charset['Charset'] == 'utf32') {`
`51`	`52`	`continue;`
`52`	`53`	`}`
`53`	`54`