bzr push into mysql-6.0 branch (skozlov:2666) WL#3894

[Serge Kozlov]

 2666 Serge Kozlov	2008-06-24
      WL#3894. fixes for debug tests
modified:
  mysql-test/suite/rpl/t/rpl_bug33931.test
  mysql-test/suite/rpl/t/rpl_incident.test
  mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
  mysql-test/suite/rpl/t/rpl_loaddata_fatal.test

=== modified file 'mysql-test/suite/rpl/t/rpl_bug33931.test'
--- a/mysql-test/suite/rpl/t/rpl_bug33931.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_bug33931.test	2008-06-23 21:23:41 +0000
@@ -28,7 +28,6 @@ eval CHANGE MASTER TO MASTER_USER='root'
 --enable_query_log
 
 start slave;
---source include/wait_for_slave_to_start.inc
 
 connection master;
 save_master_pos;

=== modified file 'mysql-test/suite/rpl/t/rpl_incident.test'
--- a/mysql-test/suite/rpl/t/rpl_incident.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_incident.test	2008-06-23 21:23:41 +0000
@@ -14,7 +14,7 @@ REPLACE INTO t1 VALUES (4);
 SELECT * FROM t1;
 
 connection slave;
---source include/wait_for_slave_to_stop.inc
+--source include/wait_for_slave_sql_to_stop.inc
 
 # The 4 should not be inserted into the table, since the incident log
 # event should have stop the slave.

=== modified file 'mysql-test/suite/rpl/t/rpl_known_bugs_detection.test'
--- a/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test	2008-06-23 21:23:41 +0000
@@ -41,7 +41,7 @@ reset master;
 drop table t1;
 connection slave;
 start slave;
---source include/wait_for_slave_to_stop.inc
+--source include/wait_for_slave_to_start.inc
 
 # testcase with INSERT SELECT
 connection master;

=== modified file 'mysql-test/suite/rpl/t/rpl_loaddata_fatal.test'
--- a/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test	2008-06-22 20:05:19 +0000
+++ b/mysql-test/suite/rpl/t/rpl_loaddata_fatal.test	2008-06-23 21:23:41 +0000
@@ -16,7 +16,7 @@ connection master;
 LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
 
 connection slave;
---source include/wait_for_slave_to_stop.inc
+--source include/wait_for_slave_sql_to_stop.inc
 source include/show_slave_status.inc;
 
 connection slave;