Merge test and results

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;

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;

sql/sql_table.cc

@@ -1971,7 +1971,9 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
       thd->exit_cond(old_message);
       if (thd->killed)
 	goto err;
-      open_for_modify=0;
+      /* Flush entries in the query cache involving this table. */
+      query_cache_invalidate3(thd, table->table, 0);
+      open_for_modify= 0;
     }
 
     int result_code = (table->table->file->*operator_func)(thd, check_opt);