diff options
| author | Shaohua Wang <shaohua.wang@oracle.com> | 2016-07-28 13:08:52 +0800 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-24 15:09:18 +0300 |
| commit | d3a2f60e1a80a70f38ac8e86f297169bad812415 (patch) | |
| tree | 8c1e938e4dedaebb341c6b268d3f9e3ff30bbd51 /mysql-test/suite/innodb/r/deadlock_detect.result | |
| parent | 1a5ca702b1301b12bf97636bd8d168120a188681 (diff) | |
| download | mariadb-git-d3a2f60e1a80a70f38ac8e86f297169bad812415.tar.gz | |
BUG#23477773 OPTION TO TURN OFF/ON DEADLOCK CHECKER
Backport WL#9383 INNODB: ADD AN OPTION TO TURN OFF/ON DEADLOCK CHECKER
(rb#12873) to 5.7.
Diffstat (limited to 'mysql-test/suite/innodb/r/deadlock_detect.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/deadlock_detect.result | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/deadlock_detect.result b/mysql-test/suite/innodb/r/deadlock_detect.result new file mode 100644 index 00000000000..c3e3794ed21 --- /dev/null +++ b/mysql-test/suite/innodb/r/deadlock_detect.result @@ -0,0 +1,30 @@ +SET GLOBAL innodb_deadlock_detect=OFF; +SET GLOBAL innodb_lock_wait_timeout=2; +connection default; +CREATE TABLE t1( +id INT, +PRIMARY KEY(id) +) ENGINE=InnoDB; +INSERT INTO t1 VALUES(1), (2), (3); +BEGIN; +SELECT * FROM t1 WHERE id = 1 FOR UPDATE; +id +1 +connect con1,localhost,root,,; +BEGIN; +SELECT * FROM t1 WHERE id = 2 FOR UPDATE; +id +2 +SELECT * FROM t1 WHERE id = 1 FOR UPDATE; +connection default; +SELECT * FROM t1 WHERE id = 2 FOR UPDATE; +connection con1; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +ROLLBACK; +connection default; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction +ROLLBACK; +DROP TABLE t1; +disconnect con1; +SET GLOBAL innodb_lock_wait_timeout=default; +SET GLOBAL innodb_deadlock_detect=default; |