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

Do not set database if not needed.

Browse Source
This commit is contained in:
Michal Čihař
2005-10-18 14:53:36 +00:00
parent 9a040b1919
commit b654a24543
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$
$Source$
2005-10-18 Michal Čihař <michal@cihar.com>
* libraries/relation.lib.php: Do not set database if not needed.
2005-10-18 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* querywindow.php: wrong handling of linebreaks in query: bug #1243888
* left.php, sql.php, tbl_change.php, libraries/common.lib.php,

7
libraries/relation.lib.php
View File

@@ -26,7 +26,9 @@
function PMA_query_as_cu($sql, $show_error = TRUE, $options = 0) {
global $err_url_0, $db, $dbh, $cfgRelation;
PMA_DBI_select_db($cfgRelation['db'], $dbh);
if ($dbh == $GLOBALS['userlink']) {
PMA_DBI_select_db($cfgRelation['db'], $dbh);
}
if ($show_error) {
$result = PMA_DBI_query($sql, $dbh, $options);
} else {
@@ -67,7 +69,7 @@
*/
function PMA_getRelationsParam($verbose = FALSE)
{
global $cfg, $server, $err_url_0, $db, $table;
global $cfg, $server, $err_url_0, $db, $table, $dbh;
global $cfgRelation;
$cfgRelation = array();
@@ -104,6 +106,7 @@ function PMA_getRelationsParam($verbose = FALSE)
// I was thinking of checking if they have all required columns but I
// fear it might be too slow
PMA_DBI_select_db($cfgRelation['db'], $dbh);
$tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']);
$tab_rs = PMA_query_as_cu($tab_query, FALSE, PMA_DBI_QUERY_STORE);