bzr push into mysql-6.0-rpl branch (aelkin:2722)

[Andrei Elkin]

 2722 Andrei Elkin	2008-11-05 [merge]
      Part 3 of manual merge with 5.1-rpl.
modified:
  mysql-test/mysql-test-run.pl*
  mysql-test/suite/rpl/rpl_1slave_base.cnf

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result'
--- a/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result	2007-06-27 12:28:02 +0000
+++ b/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result	2008-11-04 17:07:14 +0000
@@ -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);

=== modified file 'mysql-test/suite/rpl/rpl_1slave_base.cnf'
--- a/mysql-test/suite/rpl/rpl_1slave_base.cnf	2008-10-29 13:25:03 +0000
+++ b/mysql-test/suite/rpl/rpl_1slave_base.cnf	2008-11-05 15:31:08 +0000
@@ -38,12 +38,8 @@ 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
 
-
 [ENV]
 MASTER_MYPORT=              @mysqld.1.port
 MASTER_MYSOCK=              @mysqld.1.socket