From 1a175aab708fcc4261ffb8983cbe9c7b81e39785 Mon Sep 17 00:00:00 2001 From: Sven Sandberg Date: Tue, 4 Nov 2008 18:07:14 +0100 Subject: [PATCH] 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 | 2 +- mysql-test/suite/rpl/rpl_1slave_base.cnf | 3 --- 2 files changed, 1 insertion(+), 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