[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13273-gdb29c02

[Piotr Przybylski]

The branch, master has been updated
       via  db29c02f7a96d10e0369e1adf43fd285cdb3f230 (commit)
       via  7e749a5f43dfe665cdf566da9963b4b2595fe789 (commit)
      from  017c1ee960e8f3b3fc2c36e15330c1af72991e4c (commit)


- Log -----------------------------------------------------------------
commit db29c02f7a96d10e0369e1adf43fd285cdb3f230
Merge: 7e749a5f43dfe665cdf566da9963b4b2595fe789 017c1ee960e8f3b3fc2c36e15330c1af72991e4c
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sat Aug 6 12:54:28 2011 +0200

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
    
    Conflicts:
    	libraries/advisory_rules.txt

commit 7e749a5f43dfe665cdf566da9963b4b2595fe789
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Sat Aug 6 12:50:20 2011 +0200

    Fix broken character

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

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

diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index da95d48..c193f85 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -139,7 +139,7 @@ rule 'Query cache fragmentation' [!fired('Query cache disabled')]
 	Qcache_free_blocks / (Qcache_total_blocks / 2) * 100
 	value > 20
 	The query cache is considerably fragmented.
-	Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size � qcache_free_memory) / qcache_queries_in_cache
+	Severe fragmentation is likely to (further) increase Qcache_lowmem_prunes. This might be caused by many Query cache low memory prunes due to {query_cache_size} being too small. For a immediate but short lived fix you can flush the query cache (might lock the query cache for a long time). Carefully adjusting {query_cache_min_res_unit} to a lower value might help too, e.g. you can set it to the average size of your queries in the cache using this formula: (query_cache_size - qcache_free_memory) / qcache_queries_in_cache
 	The cache is currently fragmented by %s% , with 100% fragmentation meaning that the query cache is an alternating pattern of free and used blocks. This value should be below 20%. | round(value,1)
 
 rule 'Query cache low memory prunes' [Qcache_inserts > 0 && !fired('Query cache disabled')]


hooks/post-receive
-- 
phpMyAdmin