Fixed bug in query cache after temporary table creation.

Docs/manual.texi:
  change log entry
mysql-test/r/query_cache.result:
  bug test suite
mysql-test/t/query_cache.test:
  bug test suite

2 files changed, 35 insertions, 0 deletions

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index f5dc994c7c3..7c53074b6da 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -506,3 +506,23 @@ set GLOBAL query_cache_size=1900;
 show global variables like "query_cache_size";
 Variable_name	Value
 query_cache_size	1024
+set GLOBAL query_cache_size=1048576;
+create table t1 (i int not null);
+create table t2 (i int not null);
+select * from t1;
+i
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	1
+create temporary table t3 (i int not null);
+select * from t2;
+i
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	2
+select * from t3;
+i
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	2
+drop table t1, t2, t3;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index 1c9f7c51bcc..5dc6d1047f4 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -352,3 +352,18 @@ set GLOBAL query_cache_size=1700;
 set GLOBAL query_cache_size=1800;
 set GLOBAL query_cache_size=1900;
 show global variables like "query_cache_size";
+
+#
+# Temporary tables
+#
+set GLOBAL query_cache_size=1048576;
+create table t1 (i int not null);
+create table t2 (i int not null);
+select * from t1;
+show status like "Qcache_queries_in_cache";
+create temporary table t3 (i int not null);
+select * from t2;
+show status like "Qcache_queries_in_cache";
+select * from t3;
+show status like "Qcache_queries_in_cache";
+drop table t1, t2, t3;