summaryrefslogtreecommitdiff
path: root/mysql-test/main/query_cache_merge.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/main/query_cache_merge.test')
-rw-r--r--mysql-test/main/query_cache_merge.test8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/main/query_cache_merge.test b/mysql-test/main/query_cache_merge.test
index 3046c4ecbfe..6212ff624e0 100644
--- a/mysql-test/main/query_cache_merge.test
+++ b/mysql-test/main/query_cache_merge.test
@@ -1,5 +1,8 @@
# Test query cache with many tables
+set @save_query_cache_size=@@global.query_cache_size;
+set @save_query_cache_type=@@global.query_cache_type;
+
SET GLOBAL query_cache_type=ON;
SET LOCAL query_cache_type=ON;
@@ -105,8 +108,7 @@ while ($c)
dec $c;
}
-SET @@global.query_cache_size = default;
+SET @@global.query_cache_size = @save_query_cache_size;
SET @@global.table_definition_cache = @save_table_definition_cache;
-
-SET GLOBAL query_cache_type=default;
+SET @@global.query_cache_type = @save_query_cache_type;
--echo End of 5.1 tests