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

bug #1114363, error when SHOW DATABASES is disabled

Browse Source
This commit is contained in:
Marc Delisle
2005-02-07 21:55:32 +00:00
parent aa7db0d36b
commit 1df092f4d7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -11,6 +11,8 @@ $Source$
it expects a result resource it expects a result resource
* libraries/tbl_move_copy.php: bug #1117112, commands out of sync when * libraries/tbl_move_copy.php: bug #1117112, commands out of sync when
using "copy table" operation 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> 2005-02-07 Alexander M. Turek <me@derrabus.de>
* libraries/mcrypt.lib.php: Bug #1117907 ("wrong parameter count" with * libraries/mcrypt.lib.php: Bug #1117907 ("wrong parameter count" with

7
libraries/common.lib.php
View File

@@ -1309,10 +1309,13 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
} }
if ($is_show_dbs && ereg('(^|[^\])(_|%)', $dblist[$i])) { if ($is_show_dbs && ereg('(^|[^\])(_|%)', $dblist[$i])) {
$local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\''; $local_query = 'SHOW DATABASES LIKE \'' . $dblist[$i] . '\'';
$rs = PMA_DBI_query($local_query, $dbh); // here, a PMA_DBI_query() could fail silently
// "SHOW DATABASES" statement is disabled // if SHOW DATABASES is disabled
$rs = PMA_DBI_try_query($local_query, $dbh);
if ($i == 0 if ($i == 0
&& (substr(PMA_DBI_getError($dbh), 1, 4) == 1045)) { && (substr(PMA_DBI_getError($dbh), 1, 4) == 1045)) {
// "SHOW DATABASES" statement is disabled
$true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i])); $true_dblist[] = str_replace('\\_', '_', str_replace('\\%', '%', $dblist[$i]));
$is_show_dbs = FALSE; $is_show_dbs = FALSE;
} }