diff options
| author | Andrey Hristov <andrey@php.net> | 2010-08-16 17:44:50 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-08-16 17:44:50 +0000 |
| commit | c204922c7f90f2c9ebde583070080b5e3f25edfa (patch) | |
| tree | 1904355639eacbd500b05cdf9d1a0af9b06da845 /ext/mysqli/tests/mysqli_set_charset.phpt | |
| parent | 0a9ca62a77006ae7633bdafc105c3174ec16b02c (diff) | |
| download | php-git-c204922c7f90f2c9ebde583070080b5e3f25edfa.tar.gz | |
Added utf16 and utf32 support, as in MySQL 5.5, in mysqlnd.
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
Diffstat (limited to 'ext/mysqli/tests/mysqli_set_charset.phpt')
| -rw-r--r-- | ext/mysqli/tests/mysqli_set_charset.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_set_charset.phpt b/ext/mysqli/tests/mysqli_set_charset.phpt index 4f4aaa52a0..4cd6e6ec1d 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']) + if ('ucs2' == $tmp['Charset'] || 'utf16' == $tmp['Charset'] || 'utf32' == $tmp['Charset']) continue; /* Uncomment to see where it hangs - var_dump($tmp); flush(); */ |