gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tyron/master'

Browse Source
This commit is contained in:
Michal Čihař 2011-08-11 13:35:37 +02:00
commit f53800fb02
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/server_status.js
View File

@ -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 });
}
});
});

9
libraries/advisory_rules.txt
View File

@ -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

15
server_status.php
View File

@ -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('&amp;', '&', 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';
?>
?>