diff options
author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
---|---|---|
committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-04-09 17:03:48 +0200 |
commit | cd776fedba3e2902bc25ee206d6e6266e7eb9411 (patch) | |
tree | 95bf82d0e0522c6af708cd28639c82e004b5a264 /mysql-test/t/bug39022.test | |
parent | f884d233e6a5f68bab846a7bdbd041fc4415ad77 (diff) | |
parent | d516a2ae0cbd09d3b5b1667ec62b421330ab9902 (diff) | |
download | mariadb-git-10.2-connector-c-integ.tar.gz |
Merge branch '10.2' into 10.2-connector-c-integ10.2-connector-c-integ
Diffstat (limited to 'mysql-test/t/bug39022.test')
-rw-r--r-- | mysql-test/t/bug39022.test | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mysql-test/t/bug39022.test b/mysql-test/t/bug39022.test index 6056dbf0e7b..8d1deb163d7 100644 --- a/mysql-test/t/bug39022.test +++ b/mysql-test/t/bug39022.test @@ -18,20 +18,16 @@ connect (thread1, localhost, root,,); connect (thread2, localhost, root,,); connection thread1; ---echo # in thread1 START TRANSACTION; connection thread2; ---echo # in thread2 REPLACE INTO t2 VALUES (-17); SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE; connection thread1; ---echo # in thread1 REPLACE INTO t1(a,b) VALUES (67,20); connection thread2; ---echo # in thread2 COMMIT; START TRANSACTION; REPLACE INTO t1(a,b) VALUES (65,-50); @@ -40,21 +36,18 @@ send; SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE; #waits connection thread1; ---echo # in thread1 --echo # should not crash --error ER_LOCK_DEADLOCK SELECT d FROM t2,t1 WHERE d=(SELECT MAX(a) FROM t1 WHERE t1.a > t2.d) LOCK IN SHARE MODE; #crashes connection thread2; ---echo # in thread2 REAP; disconnect thread2; --source include/wait_until_disconnected.inc connection thread1; ---echo # in thread1; disconnect thread1; --source include/wait_until_disconnected.inc |