Merge with 5.2.

no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit

1 files changed, 8 insertions, 8 deletions

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index f934c5cd732..a5d995ffea0 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -912,13 +912,13 @@ a
 a
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	19
+Qcache_inserts	18
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	7
+Qcache_hits	6
 DROP TABLE t1;
 SET GLOBAL query_cache_size=0;
 SET SESSION query_cache_type = 2;
@@ -1070,10 +1070,10 @@ flush status;
 a
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	1
+Qcache_inserts	0
 show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	0
@@ -1081,13 +1081,13 @@ Qcache_hits	0
 a
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
-Qcache_queries_in_cache	1
+Qcache_queries_in_cache	0
 show status like "Qcache_inserts";
 Variable_name	Value
-Qcache_inserts	1
+Qcache_inserts	0
 show status like "Qcache_hits";
 Variable_name	Value
-Qcache_hits	1
+Qcache_hits	0
 drop table t1;
 create table t1 (a int);
 insert into t1 values (1),(2);