From 539d6f7e28370c5c13fd7688bd7a15d9c6d0f607 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 6 Oct 2006 17:00:19 +0000 Subject: [PATCH] bug #1568341, last part of the fix --- ChangeLog | 4 ++++ libraries/database_interface.lib.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8157b0ea5..2b6ab4d17 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-10-07 Marc Delisle + * libraries/database_interface.lib.php, bug #1568341, last part of + the fix to avoid problems on Windows servers, thanks to Juergen Wind + 2006-10-05 Marc Delisle * scripts/create-release.sh: starting changes for new kits TODO: - trimming of libraries/select_lang.lib.php in the kit diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 1212c6398..6c2d40395 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -270,6 +270,7 @@ function PMA_DBI_get_tables_full($database, $table = false, // for PMA bc: // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME` // + // on non-Windows servers, // added BINARY in the WHERE clause to force a case sensitive // comparison (if we are looking for the db AA we don't want // to find the db aa) @@ -296,8 +297,9 @@ function PMA_DBI_get_tables_full($database, $table = false, `CREATE_OPTIONS` AS `Create_options`, `TABLE_COMMENT` AS `Comment` FROM `information_schema`.`TABLES` - WHERE BINARY `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\') + WHERE ' . (PMA_IS_WINDOWS ? '' : 'BINARY') . ' `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\') ' . $sql_where_table; + $tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'), null, $link); unset( $sql_where_table, $sql );