diff options
author | Sven Sandberg <sven@mysql.com> | 2008-11-04 18:07:14 +0100 |
---|---|---|
committer | Sven Sandberg <sven@mysql.com> | 2008-11-04 18:07:14 +0100 |
commit | 162e550fcf986454cd1a542e98d8adc8fa81fd00 (patch) | |
tree | 810879d3658381f482b708ff3db08f8d7d8b2e0c /mysql-test | |
parent | 117f7d5e7f24d9ae12ec36d099f880c452e11065 (diff) | |
download | mariadb-git-162e550fcf986454cd1a542e98d8adc8fa81fd00.tar.gz |
BUG#40257: Please remove --loose-skip-innodb from suite/rpl/rpl_1slave_base.cnf
Removed unnecessary server options --rpl-recovery-rank. This is obsolete
and does not affect the test suite in any useful way.
mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result:
updated result file
mysql-test/suite/rpl/rpl_1slave_base.cnf:
removed unnecessary option
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/rpl/rpl_1slave_base.cnf | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result index 38972a4f571..08d3241c48f 100644 --- a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result +++ b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result @@ -14,7 +14,7 @@ n 2002 show slave hosts; Server_id Host Port Rpl_recovery_rank Master_id -2 127.0.0.1 9999 2 1 +2 127.0.0.1 9999 0 1 drop table t1; stop slave; create table t2(id int auto_increment primary key, created datetime); diff --git a/mysql-test/suite/rpl/rpl_1slave_base.cnf b/mysql-test/suite/rpl/rpl_1slave_base.cnf index 1981d233c60..23b7ded9a7d 100644 --- a/mysql-test/suite/rpl/rpl_1slave_base.cnf +++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf @@ -38,9 +38,6 @@ skip-slave-start # test results will vary, thus a relative path is used. slave-load-tmpdir= ../../tmp - -rpl-recovery-rank= @mysqld.2.server-id - loose-innodb |