summaryrefslogtreecommitdiff
path: root/mysql-test/t/innodb_mysql-master.opt
diff options
context:
space:
mode:
authorunknown <tsmith/tim@siva.hindu.god>2006-12-19 16:57:51 -0700
committerunknown <tsmith/tim@siva.hindu.god>2006-12-19 16:57:51 -0700
commit47b0a0b08904e900e6b034e32ad124139c9dcb93 (patch)
tree9d22a6e3d1f813ebfd932d958ebe02a7a5519099 /mysql-test/t/innodb_mysql-master.opt
parent9d8c9e9d96dc85cfac055b6014ac65d867152edf (diff)
downloadmariadb-git-47b0a0b08904e900e6b034e32ad124139c9dcb93.tar.gz
Added innodb_rollback_on_timeout option to restore the 4.1
InnoDB timeout behavior (Bug #24200) mysql-test/t/innodb_mysql-master.opt: Set --innodb-lock-wait-timeout=2, since test for bug #24200 times out. This *could* cause random test failures if some long-running transaction concurrency is being tested. However, such a test really should go in innodb-big or some other test file.
Diffstat (limited to 'mysql-test/t/innodb_mysql-master.opt')
-rw-r--r--mysql-test/t/innodb_mysql-master.opt1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/innodb_mysql-master.opt b/mysql-test/t/innodb_mysql-master.opt
new file mode 100644
index 00000000000..205c733455d
--- /dev/null
+++ b/mysql-test/t/innodb_mysql-master.opt
@@ -0,0 +1 @@
+--innodb-lock-wait-timeout=2