bzr push into mysql-6.0 branch (skozlov:2672) Bug#37732

[Serge Kozlov]

 2672 Serge Kozlov	2008-07-04
      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
  mysql-test/suite/rpl/t/rpl_row_stop_middle_update.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-04-25 16:54:42 +0000
+++ b/mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result	2008-07-03 20:14:21 +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-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test	2008-07-03 20:14:21 +0000
@@ -96,7 +96,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;
@@ -112,6 +112,7 @@ START SLAVE;
 disconnect slave;
 --connection master_b
 --sync_slave_with_master master_d
+--sync_slave_with_master master_a
 --echo
 
 --echo * Check data inserted before failure *

=== modified file 'mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test'
--- a/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test	2008-07-03 20:14:21 +0000
@@ -20,7 +20,7 @@ connection slave;
 # Rows_log_event (out of 3) but should wait until the last one is
 # executed before stopping.
 
---source include/wait_for_slave_to_stop.inc
+--source include/wait_for_slave_sql_to_stop.inc
 
 # check that we inserted all rows (waited until the last Rows event)
 select count(*) from t1;