diff options
| author | Matthias Leich <Matthias.Leich@sun.com> | 2009-05-20 15:27:44 +0200 |
|---|---|---|
| committer | Matthias Leich <Matthias.Leich@sun.com> | 2009-05-20 15:27:44 +0200 |
| commit | fc77e47d7c0b3b14e9df47fe640a4da6a2e31781 (patch) | |
| tree | 6441d34afbcf355f4996cccba08497aefcdd47fe /mysql-test/include | |
| parent | 5a716b09075692fcd679da1283715cd68915d3a9 (diff) | |
| parent | ccfd6971091acf689a85495be9c559064d2f8490 (diff) | |
| download | mariadb-git-fc77e47d7c0b3b14e9df47fe640a4da6a2e31781.tar.gz | |
Merge fix for bug 42308 into GCA tree
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/concurrent.inc | 11 | ||||
| -rw-r--r-- | mysql-test/include/grant_cache.inc | 19 | ||||
| -rw-r--r-- | mysql-test/include/handler.inc | 1 | ||||
| -rw-r--r-- | mysql-test/include/query_cache.inc | 3 |
4 files changed, 28 insertions, 6 deletions
diff --git a/mysql-test/include/concurrent.inc b/mysql-test/include/concurrent.inc index 2180ec4cc9c..66f8a65a102 100644 --- a/mysql-test/include/concurrent.inc +++ b/mysql-test/include/concurrent.inc @@ -659,11 +659,16 @@ drop table t1; connection thread1; select * from t1; +--echo ** Cleanup +connection thread1; +disconnect thread1; +--source include/wait_until_disconnected.inc +--echo ** connection thread2 +connection thread2; +disconnect thread2; +--source include/wait_until_disconnected.inc --echo ** connection default connection default; drop table t1; drop user mysqltest@localhost; -disconnect thread1; -disconnect thread2; - diff --git a/mysql-test/include/grant_cache.inc b/mysql-test/include/grant_cache.inc index 501e115f0ee..47eef1cdb67 100644 --- a/mysql-test/include/grant_cache.inc +++ b/mysql-test/include/grant_cache.inc @@ -171,15 +171,30 @@ show status like "Qcache_not_cached"; # Cleanup ---echo ----- switch to connection default and close connections ----- -connection default; +--echo ----- close connections ----- +connection root; disconnect root; +--source include/wait_until_disconnected.inc +connection root2; disconnect root2; +--source include/wait_until_disconnected.inc +connection user1; disconnect user1; +--source include/wait_until_disconnected.inc +connection user2; disconnect user2; +--source include/wait_until_disconnected.inc +connection user3; disconnect user3; +--source include/wait_until_disconnected.inc +connection user4; disconnect user4; +--source include/wait_until_disconnected.inc +connection unkuser; disconnect unkuser; +--source include/wait_until_disconnected.inc +--echo ----- switch to connection default ----- +connection default; # # A temporary 4.1 workaround to make this test pass if diff --git a/mysql-test/include/handler.inc b/mysql-test/include/handler.inc index 96f90aba8e0..6e7f53ba9b2 100644 --- a/mysql-test/include/handler.inc +++ b/mysql-test/include/handler.inc @@ -719,6 +719,7 @@ connection con1; --reap drop table t1; disconnect con1; +--source include/wait_until_disconnected.inc connection default; # diff --git a/mysql-test/include/query_cache.inc b/mysql-test/include/query_cache.inc index 77ea0021a5d..7ce97b42158 100644 --- a/mysql-test/include/query_cache.inc +++ b/mysql-test/include/query_cache.inc @@ -177,6 +177,7 @@ show status like "Qcache_hits"; # Final cleanup eval set GLOBAL query_cache_size=$save_query_cache_size; +disconnect connection1; +--source include/wait_until_disconnected.inc connection default; drop table t2; -disconnect connection1; |