bzr push into mysql-5.1 branch (skozlov:2638) Bug#37732

[Serge Kozlov]

 2638 Serge Kozlov	2008-07-25
      Bug#37732
modified:
  mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result
  mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test

=== modified file 'mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result'
--- a/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2008-07-10 16:09:39 +0000
+++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2008-07-25 17:23:50 +0000
@@ -115,7 +115,7 @@ SELECT 'Master D',a,b FROM t1 WHERE c = 
 Master D	a	b
 Master D	8	D
 
-* Reconfigure replication to schema A->B->C->A *
+* Reconfigure replication to schema A->B->D->A *
 STOP SLAVE;
 STOP SLAVE;
 CHANGE MASTER TO master_host='127.0.0.1',master_port=MASTER_B_PORT,master_user='root',master_log_file='LOG_FILE',master_log_pos=LOG_POS;

=== modified file 'mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test'
--- a/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2008-07-10 16:09:39 +0000
+++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2008-07-25 17:23:50 +0000
@@ -91,7 +91,7 @@ SELECT 'Master C',a,b FROM t1 WHERE c = 
 SELECT 'Master D',a,b FROM t1 WHERE c = 2 ORDER BY a,b;
 --echo
 
---echo * Reconfigure replication to schema A->B->C->A *
+--echo * Reconfigure replication to schema A->B->D->A *
 # Exclude Master C 
 --connection master_c
 STOP SLAVE;
@@ -106,6 +106,7 @@ source include/start_slave.inc;
 disconnect slave;
 --connection master_b
 --sync_slave_with_master master_d
+--sync_slave_with_master master_a
 --echo
 
 --echo * Check data inserted before failure *