diff options
| author | unknown <monty@mysql.com> | 2004-11-09 00:22:26 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 00:22:26 +0200 |
| commit | 4d514c019211ca6577e5342fcec5113c156440d0 (patch) | |
| tree | 643ae3cdbe92bfe6743c5d409a5bc45ac14af076 /mysql-test | |
| parent | d3feb035bb8c278292b147ac7ce406369004ca8a (diff) | |
| parent | fe6ea1aab2b6c8c9ed9c540bd6f3b127764ccd34 (diff) | |
| download | mariadb-git-4d514c019211ca6577e5342fcec5113c156440d0.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
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 |