[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17872-g1edb826

[Michal Čihař]

The branch, master has been updated
       via  1edb826db48c02f2325eda9112ff0185f1ecb29b (commit)
       via  b739dfd04042550c74ace2168b9b4bef56c17450 (commit)
      from  e7513146b7556976a89198440f34a4a43b8a3ca9 (commit)


- Log -----------------------------------------------------------------
commit 1edb826db48c02f2325eda9112ff0185f1ecb29b
Merge: e751314 b739dfd
Author: Michal Čihař <mcihar at suse.cz>
Date:   Tue Aug 30 11:30:07 2011 +0200

    Merge remote-tracking branch 'tyron/master'
    
    Conflicts:
    	server_status.php

commit b739dfd04042550c74ace2168b9b4bef56c17450
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Wed Aug 24 19:10:39 2011 +0300

    Bug: Live query chart always zero

-----------------------------------------------------------------------

Summary of changes:
 server_status.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server_status.php b/server_status.php
index 66244c2..14d762d 100644
--- a/server_status.php
+++ b/server_status.php
@@ -61,7 +61,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
                     $queries = PMA_DBI_fetch_result(
                         "SHOW GLOBAL STATUS
                         WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions')
-                            AND Value > 0'", 0, 1);
+                            AND Value > 0", 0, 1);
                 }
             cleanDeprecated($queries);
             // admin commands are not queries


hooks/post-receive
-- 
phpMyAdmin