nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #902414

Browse Source
This commit is contained in:
Alexander M. Turek
2004-04-19 22:25:04 +00:00
parent 7281232b88
commit 8c9f9a1d3b
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
Updated path to MySQL's searchable online documentation.
* ChangeLog: Recoded to UTF-8.
* server_privileges.php: Illegal mix of collations.
* libraries/dbi/*.dbi.lib.php: Don't touch character_set_connection
(bug #902414). This should fix many "Illegal mix of collations" errors.
2004-04-19 Marcel Tschopp <ne0x@users.sourceforge.net>
* libraries/export/sql.php, libraries/export/latex.php: Fixed a few

1
libraries/dbi/mysql.dbi.lib.php
View File

@@ -86,7 +86,6 @@ function PMA_DBI_connect($user, $password) {
if (PMA_MYSQL_INT_VERSION >= 40100) {
$mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']];
mysql_query('SET CHARACTER SET ' . $mysql_charset . ';', $link);
mysql_query('SET SESSION character_set_connection = \'' . $mysql_charset . '\';', $link);
} else {
require_once('./libraries/charset_conversion.lib.php');
}

1
libraries/dbi/mysqli.dbi.lib.php
View File

@@ -69,7 +69,6 @@ function PMA_DBI_connect($user, $password) {
if (PMA_MYSQL_INT_VERSION >= 40100) {
$mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']];
mysqli_query($link, 'SET CHARACTER SET ' . $mysql_charset . ';', MYSQLI_STORE_RESULT);
mysqli_query($link, 'SET SESSION character_set_connection = \'' . $mysql_charset . '\';', MYSQLI_STORE_RESULT);
} else {
require_once('./libraries/charset_conversion.lib.php');
}