summaryrefslogtreecommitdiff
path: root/mysql-test/include/concurrent.inc
diff options
context:
space:
mode:
authorMatthias Leich <Matthias.Leich@sun.com>2009-05-15 12:15:56 +0200
committerMatthias Leich <Matthias.Leich@sun.com>2009-05-15 12:15:56 +0200
commit21f878e7243346efa9e8ae41400528a8d5cb76cb (patch)
tree4d992c0688078d328a4150d979caaf623fd345ef /mysql-test/include/concurrent.inc
parent1b7424b9b70438b8844ba34a4eb3169146660664 (diff)
downloadmariadb-git-21f878e7243346efa9e8ae41400528a8d5cb76cb.tar.gz
Fix for Bug#42308 Several server tests do not pass MTR's --check option
Details: Most tests mentioned within the bug report were already fixed. The test modified here failed in stability (high parallel load) tests. Details: 1. Take care that disconnects are finished before the test terminates. 2. Correct wrong handling of send/reap in events_stress which caused random garbled output 3. Minor beautifying of script code
Diffstat (limited to 'mysql-test/include/concurrent.inc')
-rw-r--r--mysql-test/include/concurrent.inc11
1 files changed, 8 insertions, 3 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;
-