diff options
author | unknown <monty@mysql.com> | 2004-11-08 01:15:26 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-11-08 01:15:26 +0200 |
commit | 8793e2197aeab3a2d434a180f804f295de3a3cce (patch) | |
tree | ddbbaad823b7a741dae3314b9b8bbe356fe88f7b /mysql-test | |
parent | d93ff572cde923210d902988e4aeedcd0d56e99b (diff) | |
parent | 435b20aa6897b142f90267ea3ed7a7cef1cc385a (diff) | |
download | mariadb-git-8793e2197aeab3a2d434a180f804f295de3a3cce.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_select.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/t/rpl_failed_optimize-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_failed_optimize-master.opt b/mysql-test/t/rpl_failed_optimize-master.opt index a6ef074a120..3f82baff598 100644 --- a/mysql-test/t/rpl_failed_optimize-master.opt +++ b/mysql-test/t/rpl_failed_optimize-master.opt @@ -1 +1 @@ ---innodb-lock-wait-timeout=1 +--loose-innodb-lock-wait-timeout=1 |