svn: /php/php-src/ branches/PHP_5_3/ext/mysqli/tests/mysqli_character_set.phpt branches/PHP_5_3/ext/mysqli/tests/mysqli_set_charset.phpt
branches/PHP_5_4/ext/mysqli/tests/mysqli_character_set.phpt branches/PHP_5_4/ext/mysqli/tests/mysqli_set_charset.phpt
trunk/ext/mysqli/tests/mysqli_character_set.phpt trunk/ext/mysqli/tests/mysqli_set_charset.phpt

uw Fri, 02 Sep 2011 09:27:23 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316028 Log: MySQL 5.6 update Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_character_set.phpt U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_charset.phpt U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_character_set.phpt U php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_charset.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_character_set.phpt U php/php-src/trunk/ext/mysqli/tests/mysqli_set_charset.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_character_set.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_character_set.phpt 2011-09-02 08:57:50 UTC (rev 316027) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_character_set.phpt 2011-09-02 09:27:23 UTC (rev 316028) @@ -48,7 +48,8 @@ $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; } Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_charset.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_charset.phpt 2011-09-02 08:57:50 UTC (rev 316027) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_set_charset.phpt 2011-09-02 09:27:23 UTC (rev 316028) @@ -102,7 +102,7 @@ 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(); */ Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_character_set.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_character_set.phpt 2011-09-02 08:57:50 UTC (rev 316027) +++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_character_set.phpt 2011-09-02 09:27:23 UTC (rev 316028) @@ -48,7 +48,8 @@ $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; } Modified: php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_charset.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_charset.phpt 2011-09-02 08:57:50 UTC (rev 316027) +++ php/php-src/branches/PHP_5_4/ext/mysqli/tests/mysqli_set_charset.phpt 2011-09-02 09:27:23 UTC (rev 316028) @@ -102,7 +102,7 @@ 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(); */ Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_character_set.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_character_set.phpt 2011-09-02 08:57:50 UTC (rev 316027) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_character_set.phpt 2011-09-02 09:27:23 UTC (rev 316028) @@ -48,7 +48,8 @@ $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; } Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_set_charset.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_set_charset.phpt 2011-09-02 08:57:50 UTC (rev 316027) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_set_charset.phpt 2011-09-02 09:27:23 UTC (rev 316028) @@ -102,7 +102,7 @@ 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(); */