Merge test and results

2 files changed, 34 insertions, 2 deletions

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 9f61b029391..5fe00e70d3d 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -922,4 +922,24 @@ group_concat(a)
 12345678901234567890
 set group_concat_max_len=default;
 drop table t1;
-SET GLOBAL query_cache_size=0;
+set global query_cache_size=1024*1024;
+flush query cache;
+create table t1 ( a int );
+insert into t1 values (1);
+select a from t1;
+a
+1
+select a from t1;
+a
+1
+show status like 'qcache_queries_in_cache';
+Variable_name	Value
+Qcache_queries_in_cache	1
+repair table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	repair	status	OK
+show status like 'qcache_queries_in_cache';
+Variable_name	Value
+Qcache_queries_in_cache	0
+drop table t1;
+set GLOBAL query_cache_size=0;
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test
index d570073b1d2..b0148a689af 100644
--- a/mysql-test/t/query_cache.test
+++ b/mysql-test/t/query_cache.test
@@ -672,4 +672,16 @@ select group_concat(a) FROM t1 group by b;
 set group_concat_max_len=default;
 drop table t1;
 
-SET GLOBAL query_cache_size=0;
+# Bug #8480: REPAIR TABLE needs to flush the table from the query cache
+set global query_cache_size=1024*1024;
+flush query cache;
+create table t1 ( a int );
+insert into t1 values (1);
+select a from t1;
+select a from t1;
+show status like 'qcache_queries_in_cache';
+repair table t1;
+show status like 'qcache_queries_in_cache';
+drop table t1;
+
+set GLOBAL query_cache_size=0;