bug #1568341, last part of the fix

This commit is contained in:
Marc Delisle
2006-10-06 17:04:43 +00:00
parent 59e1a823f1
commit 9ef2fade2a
2 changed files with 7 additions and 1 deletions

View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-10-06 Marc Delisle <lem9@users.sourceforge.net>
* libraries/database_interface.lib.php, bug #1568341, last part of
the fix to avoid problems on Windows servers, thanks to Juergen Wind
2006-10-06 Michal Čihař <michal@cihar.com> 2006-10-06 Michal Čihař <michal@cihar.com>
* scripts/lang-cleanup.sh: Script for removing not installed languages * scripts/lang-cleanup.sh: Script for removing not installed languages
from libraries/select_lang.lib.php. from libraries/select_lang.lib.php.

View File

@@ -249,6 +249,7 @@ function PMA_DBI_get_tables_full($database, $table = false,
// for PMA bc: // for PMA bc:
// `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME` // `SCHEMA_FIELD_NAME` AS `SHOW_TABLE_STATUS_FIELD_NAME`
// //
// on non-Windows servers,
// added BINARY in the WHERE clause to force a case sensitive // added BINARY in the WHERE clause to force a case sensitive
// comparison (if we are looking for the db Aa we don't want // comparison (if we are looking for the db Aa we don't want
// to find the db aa) // to find the db aa)
@@ -275,8 +276,9 @@ function PMA_DBI_get_tables_full($database, $table = false,
`CREATE_OPTIONS` AS `Create_options`, `CREATE_OPTIONS` AS `Create_options`,
`TABLE_COMMENT` AS `Comment` `TABLE_COMMENT` AS `Comment`
FROM `information_schema`.`TABLES` FROM `information_schema`.`TABLES`
WHERE BINARY `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\') WHERE ' . (PMA_IS_WINDOWS ? '' : 'BINARY') . ' `TABLE_SCHEMA` IN (\'' . implode("', '", $databases) . '\')
' . $sql_where_table; ' . $sql_where_table;
$tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'), $tables = PMA_DBI_fetch_result($sql, array('TABLE_SCHEMA', 'TABLE_NAME'),
null, $link); null, $link);
unset( $sql_where_table, $sql ); unset( $sql_where_table, $sql );