diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-18 10:48:15 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-18 10:48:15 +0200 |
| commit | 20dfd709d6454f8cdc25262c945ad203cecafc02 (patch) | |
| tree | 092ee60f4043975f4820722fc764625d6271be04 /mysql-test | |
| parent | 141bb7d144e093c860f2183abf220875ee681930 (diff) | |
| download | mariadb-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')
| -rw-r--r-- | mysql-test/include/not_binlog_format_row.inc | 4 | ||||
| -rw-r--r-- | mysql-test/r/bug39022.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/bug39022.test | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/mysql-test/include/not_binlog_format_row.inc b/mysql-test/include/not_binlog_format_row.inc new file mode 100644 index 00000000000..f9354e7cd33 --- /dev/null +++ b/mysql-test/include/not_binlog_format_row.inc @@ -0,0 +1,4 @@ +if (`SELECT @@binlog_format = 'ROW'`) +{ + skip Test cannot run with binlog_format row; +} diff --git a/mysql-test/r/bug39022.result b/mysql-test/r/bug39022.result index 1c02d7873e4..5963709aa2a 100644 --- a/mysql-test/r/bug39022.result +++ b/mysql-test/r/bug39022.result @@ -28,5 +28,5 @@ SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d); ERROR 40001: Deadlock found when trying to get lock; try restarting transaction # in thread2 d -# in default +# in thread1; DROP TABLE t1,t2; 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; |