diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-01-13 00:23:07 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-01-13 00:23:07 +0000 |
| commit | 5f42365a93dee0a1ca719f3b8d4b2253567c4195 (patch) | |
| tree | 3dc2b1672b52115591675d50b39c911f4b5f75fa /mysql-test/r/mysqld--help-win.result | |
| parent | 9d89069d6437d6112104725fc704128a4f907eed (diff) | |
| download | mariadb-git-5f42365a93dee0a1ca719f3b8d4b2253567c4195.tar.gz | |
Fixes two remaining test failures:
- mysqld--help-win
Updated result so that it contains missing
value for slave-type-conversions
- rpl_idempotency
This seems a bad merge. In BUG#39934, the contents of
this file had been split into rpl_row_idempontency and
rpl_idempotency. The patch was pushed to 5.1-rep+3 which
was later merged in rep+2-delivery1 which in turn was
merged in 5.1-rpl-merge. Now while merging next-mr in
5.1-rpl-merge, the file got back it's old content (which
is in rpl_row_idempotency now because of BUG#39934). This
cset reverts the bad merge:
bzr merge -r revid:dao-gang.qu@sun.com-20100112120709-ioxp11yl9bvquaqd..\
before:revid:dao-gang.qu@sun.com-20100112120709-ioxp11yl9bvquaqd\
suite/rpl/t/rpl_idempotency.test
Diffstat (limited to 'mysql-test/r/mysqld--help-win.result')
| -rw-r--r-- | mysql-test/r/mysqld--help-win.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result index abe391c8ce8..6faeea94717 100644 --- a/mysql-test/r/mysqld--help-win.result +++ b/mysql-test/r/mysqld--help-win.result @@ -912,6 +912,7 @@ slave-load-tmpdir MYSQLTEST_VARDIR/tmp/ slave-net-timeout 3600 slave-skip-errors (No default value) slave-transaction-retries 10 +slave-type-conversions slow-launch-time 2 slow-query-log FALSE socket MySQL |