diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-06 14:19:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-06 14:19:07 +0100 |
| commit | 04b5225122a1fca7ecb5ce567ed9299cd14ea206 (patch) | |
| tree | 1f8cbdfff83649438b068dd0f4d2772101e8c495 /mysql-test/t | |
| parent | f27ea1b1524ff8a38728c0886d5e15bc4dcfffee (diff) | |
| download | mariadb-git-04b5225122a1fca7ecb5ce567ed9299cd14ea206.tar.gz | |
Bug#24805 mtr.pl can't handle test with --disable-log-bin
- Don't give mysqld the --log-bin argument if .opt file
contains --skip-log-bin
- Enable flush2 test
mysql-test/mysql-test-run.pl:
Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin
Don't pass mysqld --binlog-format=s if --skip-log-bin
mysql-test/t/disabled.def:
Enable flush2
mysql-test/t/flush2-master.opt:
Use --skip-log-bin in flush2 to test flush without bin logging
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/flush2-master.opt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 53b73363c22..eaea7c710b0 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -12,5 +12,4 @@ ndb_load : Bug#17233 user_limits : Bug#23921 random failure of user_limits.test -flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/t/flush2-master.opt index ccbd01c91d3..789275fa25e 100644 --- a/mysql-test/t/flush2-master.opt +++ b/mysql-test/t/flush2-master.opt @@ -1 +1 @@ ---disable-log-bin +--skip-log-bin |