[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-16262-gef1fe35

[Michal Čihař]

The branch, master has been updated
       via  ef1fe35f375942adb42f641d6277440025d99b99 (commit)
       via  f1b4c72e41d94e23c52e7d58fd000eacdcc5a61f (commit)
       via  6f20ebf5cfb1fa47fb84cb14729b5000449955de (commit)
       via  5b5344dca7cfd071a941ae9b3b1d439e68da4f10 (commit)
       via  08604d7f08339162238f21e06f848e9606c9ad4e (commit)
      from  ef80b7899116b2bfdeeb5d5b5c48f0f3a731136c (commit)


- Log -----------------------------------------------------------------
commit ef1fe35f375942adb42f641d6277440025d99b99
Merge: ef80b78 f1b4c72
Author: Michal Čihař <michal at cihar.com>
Date:   Mon Aug 22 09:25:02 2011 +0200

    Merge branch 'tyron'

commit f1b4c72e41d94e23c52e7d58fd000eacdcc5a61f
Author: Michal Čihař <michal at cihar.com>
Date:   Mon Aug 22 09:24:53 2011 +0200

    Revert "Fix: Monitor broken from a change by michal"
    
    This reverts commit 6f20ebf5cfb1fa47fb84cb14729b5000449955de.

commit 6f20ebf5cfb1fa47fb84cb14729b5000449955de
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Sun Aug 21 17:58:30 2011 +0300

    Fix: Monitor broken from a change by michal

commit 5b5344dca7cfd071a941ae9b3b1d439e68da4f10
Merge: 08604d7 b0ed51d
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Sat Aug 20 20:33:24 2011 +0300

    Merge remote-tracking branch 'origin/master'

commit 08604d7f08339162238f21e06f848e9606c9ad4e
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Sat Aug 20 14:18:53 2011 +0300

    duplicate rule name

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

Summary of changes:
 libraries/advisory_rules.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index 7745157..58c75d1 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -127,7 +127,7 @@ rule 'Query cache disabled'
 	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 'Query cache usage' [!fired('Query cache disabled')]
+rule 'Query caching method' [!fired('Query cache disabled')]
 	Questions / Uptime
 	value > 100
 	Suboptimal caching method.
@@ -141,7 +141,7 @@ rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query
 	Consider increasing {query_cache_limit}.
 	The current query cache hit rate of %s% is below 20% | round(value,1)
 
-rule 'Query Cache usage' [!fired('Query cache disabled')]
+rule 'Query cache usage' [!fired('Query cache disabled')]
 	100 - Qcache_free_memory / query_cache_size * 100
 	value < 80
 	Less than 80% of the query cache is being utilized.


hooks/post-receive
-- 
phpMyAdmin