Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/home/mysqldev/tulin/mysql-5.0

mysql-test/r/ndb_cache_multi2.result

@@ -72,3 +72,11 @@ show status like "Qcache_hits";
 Variable_name	Value
 Qcache_hits	0
 drop table t1, t2;
+set GLOBAL query_cache_size=0;
+set GLOBAL ndb_cache_check_time=0;
+reset query cache;
+flush status;
+set GLOBAL query_cache_size=0;
+set GLOBAL ndb_cache_check_time=0;
+reset query cache;
+flush status;

mysql-test/t/ndb_cache_multi2.test

@@ -68,4 +68,14 @@ show status like "Qcache_hits";
 
 drop table t1, t2;
 
-
+# Turn off and reset query cache on server1 and server2
+connection server1;
+set GLOBAL query_cache_size=0;
+set GLOBAL ndb_cache_check_time=0;
+reset query cache;
+flush status;
+connection server2;
+set GLOBAL query_cache_size=0;
+set GLOBAL ndb_cache_check_time=0;
+reset query cache;
+flush status;