5.5-merge

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

@@ -18,19 +18,14 @@
 -- source include/have_binlog_format_mixed_or_statement.inc
 
 connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
---disable_warnings
-drop table if exists t1, t2, t3, t4;
---enable_warnings
 connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
+
 # Create empty file
 let $MYSQLD_SLAVE_DATADIR= `select @@datadir`;
 write_file $MYSQLD_SLAVE_DATADIR/master.info;
 EOF
 chmod 0000 $MYSQLD_SLAVE_DATADIR/master.info;
 connection slave;
---disable_warnings
-drop table if exists t1, t2, t3, t4;
---enable_warnings
 
 # START SLAVE will fail because it can't read the file (mode 000)
 # (system error 13)
@@ -98,12 +93,10 @@ connection master;
 set insert_id=1234;
 insert into t2 values(NULL);
 connection slave;
---source include/wait_for_slave_sql_to_stop.inc
-
-#restart slave skipping one event
-set global sql_slave_skip_counter=1;
-start slave;
---source include/wait_for_slave_to_start.inc
+# 1062 = ER_DUP_ENTRY
+call mtr.add_suppression("Slave SQL.*Error .Duplicate entry .1234. for key .PRIMARY.. on query.* Error_code: 1062");
+--let $slave_sql_errno= 1062
+--source include/wait_for_slave_sql_error_and_skip.inc
 
 connection master;
 
@@ -194,3 +187,4 @@ show binlog events in '';
 purge master logs before now();
 
 --echo End of 5.0 tests
+--source include/stop_slave.inc