summaryrefslogtreecommitdiff
path: root/mysql-test/r/query_cache.result
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.(none)>2007-06-19 18:04:42 +0400
committerunknown <kostja@bodhi.(none)>2007-06-19 18:04:42 +0400
commit8f39efa7e1ff09542abfc15e4815716af69e5baf (patch)
treee8513465048754cabffebb3aa0320f9a25a81c6a /mysql-test/r/query_cache.result
parenta790eb7570b27a041d9895e7967b3a074caaa5af (diff)
downloadmariadb-git-8f39efa7e1ff09542abfc15e4815716af69e5baf.tar.gz
Fix a merge mistake.
Diffstat (limited to 'mysql-test/r/query_cache.result')
-rw-r--r--mysql-test/r/query_cache.result12
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index cf53ada9c20..de257e37288 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -1438,6 +1438,12 @@ 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;
+set GLOBAL query_cache_size=1000000;
+create table t1 (a char);
+insert into t1 values ('c');
+a
+drop table t1;
+set GLOBAL query_cache_size= default;
drop database if exists db1;
drop database if exists db2;
set GLOBAL query_cache_size=15*1024*1024;
@@ -1486,9 +1492,3 @@ Variable_name Value
Qcache_queries_in_cache 1
drop database db2;
drop database db3;
-set GLOBAL query_cache_size=1000000;
-create table t1 (a char);
-insert into t1 values ('c');
-a
-drop table t1;
-set GLOBAL query_cache_size= default;