summaryrefslogtreecommitdiff
path: root/mysql-test/t/innodb-consistent-master.opt
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2010-01-15 16:58:25 +0100
committerunknown <knielsen@knielsen-hq.org>2010-01-15 16:58:25 +0100
commit13029651b5535d637aa6f652f17c8c4417a803bc (patch)
treeb65c4d4bf3227b2e2b86c13f4d098b57e9a60410 /mysql-test/t/innodb-consistent-master.opt
parentd121e6630519a66eec7c953ee0eae623f592ce87 (diff)
parent5b0ab60a4bfb4d5b603cd929b7ceb0d9fd1bac22 (diff)
downloadmariadb-git-13029651b5535d637aa6f652f17c8c4417a803bc.tar.gz
Merge XtraDB 9 into MariaDB.
Diffstat (limited to 'mysql-test/t/innodb-consistent-master.opt')
-rw-r--r--mysql-test/t/innodb-consistent-master.opt1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/innodb-consistent-master.opt b/mysql-test/t/innodb-consistent-master.opt
new file mode 100644
index 00000000000..cb48f1aaf60
--- /dev/null
+++ b/mysql-test/t/innodb-consistent-master.opt
@@ -0,0 +1 @@
+--loose-innodb_lock_wait_timeout=2