5.5 merge

mysql-test/suite/rpl/t/rpl_stm_until.test

@@ -22,6 +22,7 @@
 -- source include/rpl_reset.inc
 
 # Test is dependent on binlog positions
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 
 # prepare version for substitutions
 let $VERSION=`select version()`;
@@ -73,7 +74,7 @@ select * from t1;
 --let $slave_param_value= $master_log_pos_1
 --source include/check_slave_param.inc
 
-let $relay_log_file= slave-relay-bin.000004;
+let $relay_log_file= slave-relay-bin.000003;
 let $master_log_pos= $master_log_pos_2;
 source include/get_relay_log_pos.inc;
 # try replicate all up to and not including the second insert to t2;
@@ -187,47 +188,6 @@ connection slave;
 start slave;
 sync_with_master;
 
- # Bug #47142  	"slave start until" stops 1 event too late in 4.1 to 5.0 replication
-#
-# testing fixes that refine the start position of prior-5.0 master's event
-# and by that provide correct execution of 
-# START SLAVE UNTIL ... master_log_pos= x;
-# Keep the test at the end of the file because it manipulates with binlog files 
-# to substitute the genuine one with a prepared on 4.1 server.
-#
-
---source include/rpl_reset.inc
-
-connection master;
---disable_warnings
-drop table if exists t1; # there is create table t1 in bug47142_master-bin.000001
---enable_warnings
-sync_slave_with_master;
-connection slave;
-stop slave;
-connection master;
-
-flush logs;
-let $MYSQLD_DATADIR= `select @@datadir`;
---remove_file $MYSQLD_DATADIR/master-bin.000001
---copy_file $MYSQL_TEST_DIR/std_data/bug47142_master-bin.000001 $MYSQLD_DATADIR/master-bin.000001
-# this a constant bound to the bug47142_master-bin.000001 binlog file
---let $binlog_before_drop=294;
-
-connection slave;
-stop slave;
-reset slave;
---replace_regex /master_log_pos=[0-9]+/master_log_pos=MASTER_LOG_POS/
-eval start slave until master_log_file='master-bin.000001', master_log_pos=$binlog_before_drop  /* to stop right before DROP */;
---source include/wait_for_slave_sql_to_stop.inc
-
-show tables /* t1 must exist */;
-
-# clean-up of Bug #47142 testing
-
-drop table t1; # drop on slave only, master does not have t1. 
-stop slave;
-
 # End of tests
 --let $rpl_only_running_threads= 1
 --source include/rpl_end.inc