[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14423-gf53800f

Michal Čihař nijel at users.sourceforge.net
Thu Aug 11 13:35:55 CEST 2011


The branch, master has been updated
       via  f53800fb02dd7a1460ea8e934022b68053a5e9fe (commit)
       via  71cb8b410c67f47885531aa1c34f23cada633b86 (commit)
       via  66107c8dff29bc4fe20866f1badeacad6f02a202 (commit)
       via  0e62172c7de5a46b985e45dfa8a8594acf222e14 (commit)
      from  06bb1d9e9ed7c9cec93852e9fca92c664e0caca7 (commit)


- Log -----------------------------------------------------------------
commit f53800fb02dd7a1460ea8e934022b68053a5e9fe
Merge: 06bb1d9 71cb8b4
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Aug 11 13:35:37 2011 +0200

    Merge remote-tracking branch 'tyron/master'

commit 71cb8b410c67f47885531aa1c34f23cada633b86
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Thu Aug 11 13:00:18 2011 +0300

    Run advisor automatically after opening advisor tab

commit 66107c8dff29bc4fe20866f1badeacad6f02a202
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Thu Aug 11 12:45:17 2011 +0300

    Added a rule and notes about memcached as advised by Sheeri

commit 0e62172c7de5a46b985e45dfa8a8594acf222e14
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Thu Aug 11 12:44:25 2011 +0300

    Forgot to move some code

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

Summary of changes:
 js/server_status.js          |   10 +++++++++-
 libraries/advisory_rules.txt |    9 ++++++++-
 server_status.php            |   15 +++++++--------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/js/server_status.js b/js/server_status.js
index d10c097..c798bd3 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -124,6 +124,14 @@ $(function() {
                 
                 monitorLoaded = true;
             }
+
+            // Run the advisor immediately when the user clicks the tab, but only when this is the first time
+            if (ui.tab.hash == '#statustabs_advisor' && $('table#rulesFired').length == 0) {
+                // Start with a small delay because the click event hasn't been setup yet
+                setTimeout(function() {
+                    $('a[href="#startAnalyzer"]').trigger('click');
+                }, 25);
+            }
         }
     });
 
@@ -667,4 +675,4 @@ $(function() {
         );
         $('#emptyDialog').dialog({ buttons: btns });
     }
-});
+});
\ No newline at end of file
diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index dbfa6f0..c440c46 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -124,9 +124,16 @@ rule 'Query cache disabled'
 	query_cache_size
 	value == 0 || query_cache_type == 'OFF' || query_cache_type == '0'
 	The query cache is not enabled. 
-	The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'
+	The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using memcached, ignore this recommendation.
 	query_cache_size is set to 0 or query_cache_type is set to 'OFF'
 
+rule 'memcached usage' [!fired('Query cache disabled')]
+	Questions / Uptime
+	value > 100
+	Suboptimal caching method.
+	You are using the MySQL Query cache with a fairly high traffic database. It might be worth considering to use <a href="http://dev.mysql.com/doc/refman/5.1/en/ha-memcached.html">memcached</a> instead of the MySQL Query cache, especially if you have multiple slaves.
+	The query cache is enabled and the server receives %d queries per second. This rule fires if there is more than 100 queries per second. | round(value,1)
+
 rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query cache disabled')]
 	Qcache_hits / (Com_select + Qcache_hits) * 100
 	value  < 20
diff --git a/server_status.php b/server_status.php
index a03db31..7517362 100644
--- a/server_status.php
+++ b/server_status.php
@@ -594,6 +594,12 @@ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) {
     }
 }
 
+$server = 1;
+if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
+
+$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
+                              || $cfg['Servers'][$server]['host'] == '127.0.0.1'
+                              || $cfg['Servers'][$server]['host'] == '::1';
 
 PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" .
               'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" .
@@ -620,13 +626,6 @@ require './libraries/server_common.inc.php';
  */
 require './libraries/server_links.inc.php';
 
-$server = 1;
-if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
-
-$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
-                              || $cfg['Servers'][$server]['host'] == '127.0.0.1'
-                              || $cfg['Servers'][$server]['host'] == '::1';
-
 ?>
 <div id="serverstatus">
     <h2><?php
@@ -1620,4 +1619,4 @@ function cleanDeprecated(&$server_status)
  * Sends the footer
  */
 require './libraries/footer.inc.php';
-?>
+?>
\ No newline at end of file


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list