summaryrefslogtreecommitdiff
path: root/mysql-test/r/query_cache.result
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2005-12-01 17:13:54 +0200
committerunknown <bell@sanja.is.com.ua>2005-12-01 17:13:54 +0200
commitb97a5c537b556b79e589655e25e7fac452053f6f (patch)
tree58aa88d34391fe9bda45b0d45f68aa359e2eecc8 /mysql-test/r/query_cache.result
parent01b65b731d05aa8cf41781ae9de02c5db139f075 (diff)
downloadmariadb-git-b97a5c537b556b79e589655e25e7fac452053f6f.tar.gz
postmerge fix
Diffstat (limited to 'mysql-test/r/query_cache.result')
-rw-r--r--mysql-test/r/query_cache.result50
1 files changed, 25 insertions, 25 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index c4521b4a71e..405669e95f8 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -850,31 +850,6 @@ group_concat(a)
set group_concat_max_len=default;
drop table t1;
create table t1 (a int);
-flush status;
-(select a from t1) union (select a from t1);
-a
-show status like "Qcache_queries_in_cache";
-Variable_name Value
-Qcache_queries_in_cache 1
-show status like "Qcache_inserts";
-Variable_name Value
-Qcache_inserts 1
-show status like "Qcache_hits";
-Variable_name Value
-Qcache_hits 0
-(select a from t1) union (select a from t1);
-a
-show status like "Qcache_queries_in_cache";
-Variable_name Value
-Qcache_queries_in_cache 1
-show status like "Qcache_inserts";
-Variable_name Value
-Qcache_inserts 1
-show status like "Qcache_hits";
-Variable_name Value
-Qcache_hits 1
-drop table t1;
-create table t1 (a int);
show status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 0
@@ -1047,6 +1022,31 @@ Variable_name Value
Qcache_hits 1
drop table t1;
create table t1 (a int);
+flush status;
+(select a from t1) union (select a from t1);
+a
+show status like "Qcache_queries_in_cache";
+Variable_name Value
+Qcache_queries_in_cache 1
+show status like "Qcache_inserts";
+Variable_name Value
+Qcache_inserts 1
+show status like "Qcache_hits";
+Variable_name Value
+Qcache_hits 0
+(select a from t1) union (select a from t1);
+a
+show status like "Qcache_queries_in_cache";
+Variable_name Value
+Qcache_queries_in_cache 1
+show status like "Qcache_inserts";
+Variable_name Value
+Qcache_inserts 1
+show status like "Qcache_hits";
+Variable_name Value
+Qcache_hits 1
+drop table t1;
+create table t1 (a int);
insert into t1 values (1),(2);
CREATE PROCEDURE `p1`()
begin