Show status

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@1285 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 64618f5504b2f3e9f38b0e0ed84b1b5a0d105273..592506c88110c5b359a5c6c5177e402d81bbc88a 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -21,6 +21,7 @@ function connect_error() {
                        'privileges' => lang('Privileges'),
                        'processlist' => lang('Process list'),
                        'variables' => lang('Variables'),
+                       'status' => lang('Status'),
                ) as $key => $val) {
                        echo "<a href='" . h(ME) . "$key='>$val</a>\n";
                }
@@ -47,6 +48,9 @@ function connect_error() {
        page_footer("db");
 }
 
+if (isset($_GET["status"])) {
+       $_GET["variables"] = $_GET["status"];
+}
 if (!(strlen(DB) ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]))) {
        if (strlen(DB)) {
                unset($_SESSION["databases"][$_GET["server"]]);

diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index ef4651f8e5944137c5094e60f8452801e20f26f7..11220964bba50172f870a33c43f811b835c1a511 100644 (file)
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -11,7 +11,8 @@ function bodyLoad(version) {
                if (window.jush) { // IE runs in case of an error too
                        jush.create_links = ' target="_blank"';
                        jush.urls.sql[0] = 'http://dev.mysql.com/doc/refman/' + version + '/en/$key';
-                       jush.urls.sql[0] = jush.urls.sql[0];
+                       jush.urls.sqlset[0] = jush.urls.sql[0];
+                       jush.urls.sqlstatus[0] = jush.urls.sql[0];
                        jush.style(jushRoot + 'jush.css');
                        jush.highlight_tag('pre', 0);
                        jush.highlight_tag('code');

diff --git a/adminer/variables.inc.php b/adminer/variables.inc.php
index 127ddc6cc2ff5715669e673d9fdf43f05885548d..eb33eaf13ebdae270deb79ba030c8f864add4e94 100644 (file)
--- a/adminer/variables.inc.php
+++ b/adminer/variables.inc.php
@@ -1,11 +1,12 @@
 <?php
-page_header(lang('Variables'));
+$status = isset($_GET["status"]);
+page_header($status ? lang('Status') : lang('Variables'));
 
+$result = $connection->query($status ? "SHOW STATUS" : "SHOW VARIABLES");
 echo "<table cellspacing='0'>\n";
-$result = $connection->query("SHOW VARIABLES");
 while ($row = $result->fetch_assoc()) {
        echo "<tr>";
-       echo "<th><code class='jush-sqlset'>" . h($row["Variable_name"]) . "</code>";
+       echo "<th><code class='jush-" . ($status ? "sqlstatus" : "sqlset") . "'>" . h($row["Variable_name"]) . "</code>";
        echo "<td>" . nbsp($row["Value"]);
 }
 echo "</table>\n";