Merge query_cache tests

Build-tools/Do-compile:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Update results
mysql-test/t/query_cache.test:
  Merge test

1 files changed, 21 insertions, 0 deletions

diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
index 3568be8cc12..3becb9546e2 100644
--- a/mysql-test/r/query_cache.result
+++ b/mysql-test/r/query_cache.result
@@ -957,3 +957,24 @@ drop table t1;
 select table_name from information_schema.tables
 where table_schema="test";
 table_name
+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;