summaryrefslogtreecommitdiff
path: root/mysql-test/t/bug39022.test
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2010-02-18 10:48:15 +0200
committerGeorgi Kodinov <joro@sun.com>2010-02-18 10:48:15 +0200
commit20dfd709d6454f8cdc25262c945ad203cecafc02 (patch)
tree092ee60f4043975f4820722fc764625d6271be04 /mysql-test/t/bug39022.test
parent141bb7d144e093c860f2183abf220875ee681930 (diff)
downloadmariadb-git-20dfd709d6454f8cdc25262c945ad203cecafc02.tar.gz
Bug #51049: main.bug39022 fails in mysql-trunk-merge
Fixed the test to behave correctly with ps-protocol and binlog format row.
Diffstat (limited to 'mysql-test/t/bug39022.test')
-rw-r--r--mysql-test/t/bug39022.test11
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/t/bug39022.test b/mysql-test/t/bug39022.test
index 1a1d10f5592..268b207e0e5 100644
--- a/mysql-test/t/bug39022.test
+++ b/mysql-test/t/bug39022.test
@@ -1,5 +1,6 @@
-- source include/have_log_bin.inc
-- source include/have_innodb.inc
+-- source include/not_binlog_format_row.inc
--echo #
--echo # Bug #39022: Mysql randomly crashing in lock_sec_rec_cons_read_sees
@@ -49,10 +50,14 @@ connection thread2;
--echo # in thread2
REAP;
-connection default;
---echo # in default
+disconnect thread2;
+--source include/wait_until_disconnected.inc
+connection thread1;
+--echo # in thread1;
disconnect thread1;
-disconnect thread2;
+--source include/wait_until_disconnected.inc
+
+connection default;
DROP TABLE t1,t2;