From 8c9f9a1d3be809e6c783e78a64b534c6383120f2 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 19 Apr 2004 22:25:04 +0000 Subject: [PATCH] bug #902414 --- ChangeLog | 2 ++ libraries/dbi/mysql.dbi.lib.php | 1 - libraries/dbi/mysqli.dbi.lib.php | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 643a3a85c..2837b3a65 100755 --- a/ChangeLog +++ b/ChangeLog @@ -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 * libraries/export/sql.php, libraries/export/latex.php: Fixed a few diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 41fba4ea7..201e2b0c8 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -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'); } diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index 81ca4a7d2..7bda30dd0 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -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'); }