Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime

into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime

Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
a1978fef · thek@adventure.(none) · 4b5914ca · 9388592a · a1978fef · a1978fef
Commit a1978fef authored Oct 16, 2007 by thek@adventure.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

mysql-test/r/query_cache.result mysql-test/r/query_cache.result +4 -0

mysql-test/t/query_cache.test mysql-test/t/query_cache.test +6 -0

No files found.
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1651,3 +1651,7 @@ a	(select count(*) from t2)
 4	0
 drop table t1,t2;
 End of 5.0 tests
+set GLOBAL query_cache_type=default;
+set GLOBAL query_cache_limit=default;
+set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size=default;
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -1293,3 +1293,9 @@ disconnect user3;
 # show status like 'Qcache_queries_in_cache';
 # drop database db2;
 # drop database db3;
+
+set GLOBAL query_cache_type=default;
+set GLOBAL query_cache_limit=default;
+set GLOBAL query_cache_min_res_unit=default;
+set GLOBAL query_cache_size=default;
+