summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-02-21 11:45:51 +0100
committerunknown <joreland@mysql.com>2005-02-21 11:45:51 +0100
commitb526f4341163faf1f24de353dccdc9a1b7c3dbf3 (patch)
tree692a1d3e5f002f341cd1d879b1e4975c74c17cb6
parent493911bdde8e0b15fee968d090197b7a65e8a873 (diff)
downloadmariadb-git-b526f4341163faf1f24de353dccdc9a1b7c3dbf3.tar.gz
ndb - ndb_multi - reset query cache at end of test
mysql-test/r/ndb_cache_multi2.result: reset query cache settings on end of test mysql-test/t/ndb_cache_multi2.test: reset query cache settings on end of test
-rw-r--r--mysql-test/r/ndb_cache_multi2.result8
-rw-r--r--mysql-test/t/ndb_cache_multi2.test12
2 files changed, 19 insertions, 1 deletions
diff --git a/mysql-test/r/ndb_cache_multi2.result b/mysql-test/r/ndb_cache_multi2.result
index 6e435c071b5..2863908a436 100644
--- a/mysql-test/r/ndb_cache_multi2.result
+++ b/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;
diff --git a/mysql-test/t/ndb_cache_multi2.test b/mysql-test/t/ndb_cache_multi2.test
index a9d008dba7c..f9ccb0bf53e 100644
--- a/mysql-test/t/ndb_cache_multi2.test
+++ b/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;