beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Always flush in navigation because table_status can take long

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@849 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2009-07-16 17:45:07 +00:00
parent 0f29896dfa
commit 4a014a6d69
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adminer/include/adminer.inc.php
View file

@ -84,6 +84,8 @@ function adminer_message_query($query) {
function adminer_navigation($missing) { function adminer_navigation($missing) {
global $SELF; global $SELF;
if (call_adminer('navigation', true, $missing) && $missing != "auth") { if (call_adminer('navigation', true, $missing) && $missing != "auth") {
ob_flush();
flush();
$databases = get_databases(); $databases = get_databases();
?> ?>
<form action="" method="post"> <form action="" method="post">

6
adminer/include/mysql.inc.php
View file

@ -201,14 +201,10 @@ function connect() {
return $dbh->error; return $dbh->error;
} }
function get_databases($flush = true) { function get_databases() {
// SHOW DATABASES can take a very long time so it is cached // SHOW DATABASES can take a very long time so it is cached
$return = &$_SESSION["databases"][$_GET["server"]]; $return = &$_SESSION["databases"][$_GET["server"]];
if (!isset($return)) { if (!isset($return)) {
if ($flush) {
ob_flush();
flush();
}
$return = get_vals("SHOW DATABASES"); $return = get_vals("SHOW DATABASES");
} }
return $return; return $return;

2
editor/include/adminer.inc.php
View file

@ -8,7 +8,7 @@ function adminer_credentials() {
} }
function adminer_database() { function adminer_database() {
$dbs = get_databases(false); $dbs = get_databases();
return call_adminer('database', (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test'))); return call_adminer('database', (count($dbs) == 1 ? $dbs[0] : (count($dbs) == 2 && information_schema($dbs[0]) ? $dbs[1] : 'test')));
} }