diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-04 10:53:15 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-04 10:53:15 -0300 |
commit | 49d88efc078f384605edc7fb999e7678d6aa51e0 (patch) | |
tree | 0e16d7008f0346b0a3a87d68e81cfed416c2cbb4 /mysql-test/t/bug40113-master.opt | |
parent | 52c95d0ccfef7f897bd79ee4b48da5ec752c70c2 (diff) | |
parent | 77acccc21fd4e95811757d95788d711fff45c586 (diff) | |
download | mariadb-git-49d88efc078f384605edc7fb999e7678d6aa51e0.tar.gz |
Merge from mysql-5.0-bugteam.
Diffstat (limited to 'mysql-test/t/bug40113-master.opt')
-rw-r--r-- | mysql-test/t/bug40113-master.opt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/bug40113-master.opt b/mysql-test/t/bug40113-master.opt new file mode 100644 index 00000000000..462f8fbe828 --- /dev/null +++ b/mysql-test/t/bug40113-master.opt @@ -0,0 +1 @@ +--innodb_lock_wait_timeout=1 |