4 files changed, 11 insertions, 1 deletions
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index c2a6b2aaec9..1170cbebeaf 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -20,8 +20,14 @@ drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;
+
 #test handling of aborted connection in the middle of update
 connection master;
+reset master;
+connection slave;
+reset slave;
+
+connection master;
 drop table if exists t1,t2;
 create table t1(n int);
 let $1=30000;
@@ -44,6 +50,8 @@ connection master;
 reap;
 connection slave;
 sync_with_master ;
+#give the slave a chance to exit
+sleep 0.5;
 show slave status;
 set sql_slave_skip_counter=1;
 slave start;
diff --git a/mysql-test/t/rpl000015-slave.sh b/mysql-test/t/rpl000015-slave.sh
new file mode 100755
index 00000000000..a421a6f287b
--- /dev/null
+++ b/mysql-test/t/rpl000015-slave.sh
@@ -0,0 +1 @@
+rm $MYSQL_TEST_DIR/var/slave-data/master.info
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index ce04b18d2e8..0cf87d0fae4 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -13,7 +13,7 @@ show slave status;
 change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=9306;
 show slave status;
-slave start;
+!slave start;
 sync_with_master;
 show slave status;
 connection master;
diff --git a/mysql-test/t/rpl000016-slave.sh b/mysql-test/t/rpl000016-slave.sh
new file mode 100755
index 00000000000..a421a6f287b
--- /dev/null
+++ b/mysql-test/t/rpl000016-slave.sh
@@ -0,0 +1 @@
+rm $MYSQL_TEST_DIR/var/slave-data/master.info