diff options
| author | unknown <thek@adventure.(none)> | 2008-03-10 16:46:38 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-03-10 16:46:38 +0100 |
| commit | 269ccba9e782877f65e940cc6a390e6d9686ae1e (patch) | |
| tree | 44112389a3d868836f09028d870de0ab2043af9e | |
| parent | eea48abc777b98bc06699fa4593aff2a71751e79 (diff) | |
| parent | c184cd6320ac3b5cbd1ab953d94ea1ef8c4d200e (diff) | |
| download | mariadb-git-269ccba9e782877f65e940cc6a390e6d9686ae1e.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug25132/my50-bug25132
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/sql_cache.cc:
Auto merged
mysql-test/r/query_cache.result:
Manual merge
mysql-test/t/query_cache.test:
Manual merge
| -rw-r--r-- | mysql-test/r/query_cache.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/query_cache.test | 9 | ||||
| -rw-r--r-- | sql/sql_cache.cc | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 1a728354c7b..ea42b6616a1 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -1650,6 +1650,16 @@ a (select count(*) from t2) 3 0 4 0 drop table t1,t2; +# +# Bug#25132 disabled query cache: Qcache_free_blocks = 1 +# +set global query_cache_size=100000; +set global query_cache_size=0; +set global query_cache_type=0; +show status like 'Qcache_free_blocks'; +Variable_name Value +Qcache_free_blocks 0 +Restore default values. set GLOBAL query_cache_type=default; set GLOBAL query_cache_limit=default; set GLOBAL query_cache_min_res_unit=default; diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 771a32e8cd7..83fe1ab7d6e 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -1251,6 +1251,15 @@ disconnect user2; disconnect user3; # +--echo # +--echo # Bug#25132 disabled query cache: Qcache_free_blocks = 1 +--echo # +set global query_cache_size=100000; +set global query_cache_size=0; +set global query_cache_type=0; +show status like 'Qcache_free_blocks'; + +--echo Restore default values. # Bug #28211 RENAME DATABASE and query cache don't play nicely together # # TODO: enable these tests when RENAME DATABASE is implemented. diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index ae6765c7934..388700f0efa 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1998,6 +1998,7 @@ void Query_cache::make_disabled() query_cache_size= 0; queries_blocks= 0; free_memory= 0; + free_memory_blocks= 0; bins= 0; steps= 0; cache= 0; |