bug #1114363, error when SHOW DATABASES is disabled
This commit is contained in:
@@ -11,6 +11,8 @@ $Source$
|
||||
it expects a result resource
|
||||
* libraries/tbl_move_copy.php: bug #1117112, commands out of sync when
|
||||
using "copy table" operation
|
||||
* libraries/common.lib.php: bug #1114363, error when SHOW DATABASES is
|
||||
disabled
|
||||
|
||||
2005-02-07 Alexander M. Turek <me@derrabus.de>
|
||||
* libraries/mcrypt.lib.php: Bug #1117907 ("wrong parameter count" with
|
||||
|
@@ -1309,10 +1309,13 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
|
||||
}
|
||||
if ($is_show_dbs && ereg('(^|[^\])(_|%)', $dblist[$i])) {
|
||||
$local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\'';
|
||||
$rs = PMA_DBI_query($local_query, $dbh);
|
||||
// "SHOW DATABASES" statement is disabled
|
||||
// here, a PMA_DBI_query() could fail silently
|
||||
// if SHOW DATABASES is disabled
|
||||
$rs = PMA_DBI_try_query($local_query, $dbh);
|
||||
|
||||
if ($i == 0
|
||||
&& (substr(PMA_DBI_getError($dbh), 1, 4) == 1045)) {
|
||||
// "SHOW DATABASES" statement is disabled
|
||||
$true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
|
||||
$is_show_dbs = FALSE;
|
||||
}
|
||||
|
Reference in New Issue
Block a user