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_character_set.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_character_set.phpt')
| -rw-r--r-- | ext/mysqli/tests/mysqli_character_set.phpt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt index 5ca264a369..191a163f24 100644 --- 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; } |