summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <thek@adventure.(none)>2008-01-11 14:16:46 +0100
committerunknown <thek@adventure.(none)>2008-01-11 14:16:46 +0100
commitcedfe557be21824c78994ae235ac6226f6df119f (patch)
tree53eedf7eaaf31d0fc8064f85946931055a28e9ce
parent44101143f7668cc753f9f78057f164469b051760 (diff)
downloadmariadb-git-cedfe557be21824c78994ae235ac6226f6df119f.tar.gz
Fixed faulty test case caused by race condition.
mysql-test/r/query_cache_debug.result: Fixed faulty test case.
-rw-r--r--mysql-test/r/query_cache_debug.result4
-rw-r--r--mysql-test/t/query_cache_debug.test3
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/r/query_cache_debug.result b/mysql-test/r/query_cache_debug.result
index 4a4948c9845..f177bfac836 100644
--- a/mysql-test/r/query_cache_debug.result
+++ b/mysql-test/r/query_cache_debug.result
@@ -11,14 +11,14 @@ On a second connection; clear the query cache.
show status like 'Qcache_queries_in_cache';
Variable_name Value
Qcache_queries_in_cache 1
-set global query_cache_size= 0;;
+set global query_cache_size= 0;
Signal the debug hook to release the lock.
select id from information_schema.processlist where state='wait_in_query_cache_insert' into @thread_id;
kill query @thread_id;
Show query cache status.
show status like 'Qcache_queries_in_cache';
Variable_name Value
-Qcache_queries_in_cache 1
+Qcache_queries_in_cache 0
set global query_cache_size= 0;
use test;
drop table t1;
diff --git a/mysql-test/t/query_cache_debug.test b/mysql-test/t/query_cache_debug.test
index 57a5e615c1d..b741eea0b29 100644
--- a/mysql-test/t/query_cache_debug.test
+++ b/mysql-test/t/query_cache_debug.test
@@ -1,3 +1,4 @@
+--source include/not_embedded.inc
--source include/have_query_cache.inc
--source include/have_debug.inc
@@ -27,7 +28,7 @@ let $wait_condition= select count(*)= 1 from information_schema.processlist wher
connection bug30887con2;
--echo On a second connection; clear the query cache.
show status like 'Qcache_queries_in_cache';
---send set global query_cache_size= 0;
+set global query_cache_size= 0;
connection default;
--echo Signal the debug hook to release the lock.