diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-02-09 22:00:15 +0100 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-02-09 22:00:15 +0100 |
| commit | 0ef6e2a5ab39fc1d2768ba651d0c3ef85612c2c6 (patch) | |
| tree | cd78b56e7f59f946ca6f42d96b186a1489fb8bd2 /mysql-test/t/query_cache_notembedded.test | |
| parent | 3ba87c370005437656bbcafb0b9ee75527342752 (diff) | |
| parent | 4c0dd2a7b346604ca57ea5871bc04298f174561c (diff) | |
| download | mariadb-git-0ef6e2a5ab39fc1d2768ba651d0c3ef85612c2c6.tar.gz | |
Merge 5.0 -> 5.1
Diffstat (limited to 'mysql-test/t/query_cache_notembedded.test')
| -rw-r--r-- | mysql-test/t/query_cache_notembedded.test | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test index c3889ef0267..095d47f5bdf 100644 --- a/mysql-test/t/query_cache_notembedded.test +++ b/mysql-test/t/query_cache_notembedded.test @@ -1,6 +1,10 @@ -- source include/have_query_cache.inc -- source include/not_embedded.inc +# Save the initial number of concurrent sessions +--source include/count_sessions.inc + + # # Tests with query cache # @@ -79,7 +83,7 @@ show status like "Qcache_free_blocks"; drop table t1, t2, t3, t11, t21; # -# do not use QC if tables locked (BUG#12385) +# do not use QC if tables locked (Bug#12385) # connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); connection root; @@ -96,10 +100,13 @@ SELECT * FROM t1; connection root; SELECT * FROM t1; drop table t1; +connection default; +disconnect root; +disconnect root2; # -# query in QC from normal execution and SP (BUG#6897) -# improved to also test BUG#3583 and BUG#12990 +# query in QC from normal execution and SP (Bug#6897) +# improved to also test Bug#3583 and Bug#12990 # flush query cache; reset query cache; @@ -181,7 +188,7 @@ drop procedure f4; drop table t1; # -# bug#14767: INSERT in SF + concurrent SELECT with query cache +# Bug#14767 INSERT in SF + concurrent SELECT with query cache # connection default; SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; @@ -257,6 +264,7 @@ SELECT id FROM view1 WHERE id>2; show status like 'Qcache_queries_in_cache'; connection default; +USE test; DROP DATABASE bug30269; disconnect bug30269; DROP USER 'bug30269'@'localhost'; @@ -266,3 +274,5 @@ set GLOBAL query_cache_limit=default; set GLOBAL query_cache_min_res_unit=default; set GLOBAL query_cache_size=default; +# Wait till we reached the initial number of concurrent sessions +--source include/wait_until_count_sessions.inc |