diff options
author | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2010-01-15 16:58:25 +0100 |
commit | 13029651b5535d637aa6f652f17c8c4417a803bc (patch) | |
tree | b65c4d4bf3227b2e2b86c13f4d098b57e9a60410 /mysql-test/t/innodb-master.opt | |
parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
parent | 5b0ab60a4bfb4d5b603cd929b7ceb0d9fd1bac22 (diff) | |
download | mariadb-git-13029651b5535d637aa6f652f17c8c4417a803bc.tar.gz |
Merge XtraDB 9 into MariaDB.
Diffstat (limited to 'mysql-test/t/innodb-master.opt')
-rw-r--r-- | mysql-test/t/innodb-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/innodb-master.opt b/mysql-test/t/innodb-master.opt index 4901efb416c..72c88068345 100644 --- a/mysql-test/t/innodb-master.opt +++ b/mysql-test/t/innodb-master.opt @@ -1 +1 @@ ---binlog_cache_size=32768 --innodb_lock_wait_timeout=1 +--binlog_cache_size=32768 --loose_innodb_lock_wait_timeout=1 |