diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-03-30 18:16:57 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-03-30 18:16:57 +0200 |
commit | 5a3b3d9afb6233ff785eab2a9679374ae274a75c (patch) | |
tree | 875f73a5e544d5081679d47586ae25b90498fb86 /mysql-test/t/partition_innodb-master.opt | |
parent | 205baff9ab39cc030b950ae751118561918f3e83 (diff) | |
parent | d904739cc1d98107f67e76a67b0ea6eb2af326ec (diff) | |
download | mariadb-git-5a3b3d9afb6233ff785eab2a9679374ae274a75c.tar.gz |
automerge
Diffstat (limited to 'mysql-test/t/partition_innodb-master.opt')
-rw-r--r-- | mysql-test/t/partition_innodb-master.opt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/partition_innodb-master.opt b/mysql-test/t/partition_innodb-master.opt new file mode 100644 index 00000000000..462f8fbe828 --- /dev/null +++ b/mysql-test/t/partition_innodb-master.opt @@ -0,0 +1 @@ +--innodb_lock_wait_timeout=1 |