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

Do not try to restore database as control user, it has to fail.

Browse Source
This commit is contained in:
Michal Čihař
2005-10-08 18:27:48 +00:00
parent 3649d901ec
commit a841d13500
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -55,6 +55,8 @@ $Source$
list. list.
* tbl_*: Use more require_once to avoid acquiring table info several * tbl_*: Use more require_once to avoid acquiring table info several
times. times.
* libraries/relation.lib.php: Do not try to restore database as control
user, it has to fail.
2005-10-07 Marc Delisle <lem9@users.sourceforge.net> 2005-10-07 Marc Delisle <lem9@users.sourceforge.net>
* libraries/check_user_privileges.lib.php: bug #1313821, dbname containing a * libraries/check_user_privileges.lib.php: bug #1313821, dbname containing a

6
libraries/relation.lib.php
View File

@@ -32,7 +32,10 @@
} else { } else {
$result = @PMA_DBI_try_query($sql, $dbh, $options); $result = @PMA_DBI_try_query($sql, $dbh, $options);
} // end if... else... } // end if... else...
PMA_DBI_select_db($db, $dbh); // It makes no sense to restore database on control user
if ($dbh == $GLOBALS['userlink']) {
PMA_DBI_select_db($db, $dbh);
}
if ($result) { if ($result) {
return $result; return $result;
@@ -100,7 +103,6 @@ function PMA_getRelationsParam($verbose = FALSE)
// example enable relations but not pdf... // example enable relations but not pdf...
// I was thinking of checking if they have all required columns but I // I was thinking of checking if they have all required columns but I
// fear it might be too slow // fear it might be too slow
// PMA_DBI_select_db($cfgRelation['db']);
$tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']); $tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']);
$tab_rs = PMA_query_as_cu($tab_query, FALSE, PMA_DBI_QUERY_STORE); $tab_rs = PMA_query_as_cu($tab_query, FALSE, PMA_DBI_QUERY_STORE);