mirror of
https://github.com/php/php-src.git
synced 2024-09-23 02:47:26 +00:00
MySQL 5.6 update
This commit is contained in:
parent
8c5fa2ba56
commit
280c4da0d1
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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(); */
|
||||
|
Loading…
Reference in New Issue
Block a user