[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17873-gc8dd9d5

Michal Čihař nijel at users.sourceforge.net
Tue Aug 30 11:41:44 CEST 2011


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


- Log -----------------------------------------------------------------
commit c8dd9d5d4ac3c3007a5434db8139093910033d7f
Author: Michal Čihař <mcihar at suse.cz>
Date:   Tue Aug 30 11:41:31 2011 +0200

    Fix indentation

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

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

diff --git a/server_status.php b/server_status.php
index 14d762d..d7da7b3 100644
--- a/server_status.php
+++ b/server_status.php
@@ -48,21 +48,21 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
 
         // Query realtime chart
         case 'queries':
-                if (PMA_DRIZZLE) {
-                    $sql = "SELECT concat('Com_', variable_name), variable_value
-                        FROM data_dictionary.GLOBAL_STATEMENTS
-                        WHERE variable_value > 0
-                          UNION
-                        SELECT variable_name, variable_value
-                        FROM data_dictionary.GLOBAL_STATUS
-                        WHERE variable_name = 'Questions'";
-                    $queries = PMA_DBI_fetch_result($sql, 0, 1);
-                } else {
-                    $queries = PMA_DBI_fetch_result(
-                        "SHOW GLOBAL STATUS
-                        WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions')
-                            AND Value > 0", 0, 1);
-                }
+            if (PMA_DRIZZLE) {
+                $sql = "SELECT concat('Com_', variable_name), variable_value
+                    FROM data_dictionary.GLOBAL_STATEMENTS
+                    WHERE variable_value > 0
+                      UNION
+                    SELECT variable_name, variable_value
+                    FROM data_dictionary.GLOBAL_STATUS
+                    WHERE variable_name = 'Questions'";
+                $queries = PMA_DBI_fetch_result($sql, 0, 1);
+            } else {
+                $queries = PMA_DBI_fetch_result(
+                    "SHOW GLOBAL STATUS
+                    WHERE (Variable_name LIKE 'Com_%' OR Variable_name = 'Questions')
+                        AND Value > 0", 0, 1);
+            }
             cleanDeprecated($queries);
             // admin commands are not queries
             unset($queries['Com_admin_commands']);


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list