1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge adventure.(none):/home/thek/Development/cpp/bug25132/my50-bug25132

Browse Source 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
This commit is contained in:
thek@adventure.(none) 2008-03-10 16:46:38 +01:00
commit 31ff514ea2
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/query_cache.result
View File

@ -1650,6 +1650,16 @@ a (select count(*) from t2)
3 0 3 0
4 0 4 0
drop table t1,t2; 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_type=default;
set GLOBAL query_cache_limit=default; set GLOBAL query_cache_limit=default;
set GLOBAL query_cache_min_res_unit=default; set GLOBAL query_cache_min_res_unit=default;

9
mysql-test/t/query_cache.test
View File

@ -1251,6 +1251,15 @@ disconnect user2;
disconnect user3; 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 # Bug #28211 RENAME DATABASE and query cache don't play nicely together
# #
# TODO: enable these tests when RENAME DATABASE is implemented. # TODO: enable these tests when RENAME DATABASE is implemented.

1
sql/sql_cache.cc
View File

@ -1998,6 +1998,7 @@ void Query_cache::make_disabled()
query_cache_size= 0; query_cache_size= 0;
queries_blocks= 0; queries_blocks= 0;
free_memory= 0; free_memory= 0;
free_memory_blocks= 0;
bins= 0; bins= 0;
steps= 0; steps= 0;
cache= 0; cache= 0;