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

MySQL 4.1.13 and double quotes in SHOW VARIABLES

Browse Source
This commit is contained in:
Marc Delisle
2006-08-09 12:14:29 +00:00
parent c8c95392a3
commit 5c1ae58e07
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-08-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/mysql_charsets.lib.php: bug #1530574:
MySQL 4.1.13 and double quotes in SHOW VARIABLES,
thanks to Herve Pages
2006-08-08 Marc Delisle <lem9@users.sourceforge.net> 2006-08-08 Marc Delisle <lem9@users.sourceforge.net>
* db_operations.php: added a FIXME for db copy with Add Constraints * db_operations.php: added a FIXME for db copy with Add Constraints
and mysql extension and mysql extension

4
libraries/mysql_charsets.lib.php
View File

@@ -121,7 +121,9 @@ if (PMA_MYSQL_INT_VERSION >= 40100){
// MySQL 4.1.0 does not support seperate charset settings // MySQL 4.1.0 does not support seperate charset settings
// for databases. // for databases.
PMA_DBI_select_db( $db ); PMA_DBI_select_db( $db );
$return = PMA_DBI_fetch_value( 'SHOW VARIABLES LIKE "collation_database"', 0, 1 ); // we got one case in 4.1.13 where the query does not work
// if this string is in double quotes
$return = PMA_DBI_fetch_value( 'SHOW VARIABLES LIKE \'collation_database\'', 0, 1 );
if ( isset( $GLOBALS['db'] ) && $db !== $GLOBALS['db'] ) { if ( isset( $GLOBALS['db'] ) && $db !== $GLOBALS['db'] ) {
PMA_DBI_select_db( $GLOBALS['db'] ); PMA_DBI_select_db( $GLOBALS['db'] );
} }