diff options
author | msvensson@neptunus.(none) <> | 2006-10-19 11:35:10 +0200 |
---|---|---|
committer | msvensson@neptunus.(none) <> | 2006-10-19 11:35:10 +0200 |
commit | 6573fed1c71c98328091f5af0a001c644ef0c9d6 (patch) | |
tree | d3d64143de5ec72f51638c6a3dfddb6a45b92c51 /mysql-test | |
parent | 179c17adfa6210ef3824e8a208968fe3ff3e761e (diff) | |
parent | f59ac964f41eb2269c9047587fd8061a0d117960 (diff) | |
download | mariadb-git-6573fed1c71c98328091f5af0a001c644ef0c9d6.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/t/rpl_log-master.opt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/rpl_log-master.opt b/mysql-test/t/rpl_log-master.opt index e0d075c3fbd..cef79bc8585 100644 --- a/mysql-test/t/rpl_log-master.opt +++ b/mysql-test/t/rpl_log-master.opt @@ -1 +1 @@ ---skip-external-locking +--force-restart |