diff options
| author | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-12-08 14:27:33 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@sun.com> | 2009-12-08 14:27:33 +0100 |
| commit | 5ce2421bb14740fe3d647e0fab04a5d44aaa4d1f (patch) | |
| tree | 3d32eea9f9af9fe086e56be5db2af9e41fa0a636 /mysql-test/t/innodb_mysql_lock-master.opt | |
| parent | 8da6d448b4451cf272ff1d3f1600e2a63e33e0c7 (diff) | |
| download | mariadb-git-5ce2421bb14740fe3d647e0fab04a5d44aaa4d1f.tar.gz | |
Backport of revno: 2617.65.1
Bug #22876 Four-way deadlock
This bug was fixed as a part of Bug#989
"If DROP TABLE while there's an active transaction, wrong binlog order"
A statement which would have caused circular wait will now
be aborted with ER_LOCK_DEADLOCK.
Test case based on bug description added to innodb_mysql_lock.test.
Note that innodb_lock_wait_timeout is set to 5 mins to
prevent race conditions in the test.
Diffstat (limited to 'mysql-test/t/innodb_mysql_lock-master.opt')
| -rw-r--r-- | mysql-test/t/innodb_mysql_lock-master.opt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_mysql_lock-master.opt b/mysql-test/t/innodb_mysql_lock-master.opt new file mode 100644 index 00000000000..0041949b829 --- /dev/null +++ b/mysql-test/t/innodb_mysql_lock-master.opt @@ -0,0 +1 @@ +--innodb_lock_wait_timeout=300 |