1 files changed, 9 insertions, 16 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test b/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
index 0be33a46c04..c3ecd9381c9 100644
--- a/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
+++ b/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
@@ -1,6 +1,4 @@
 ###########################################################
-# 2006-02-08: By JBM:  
-###########################################################
 # See if queries that use both auto_increment and LAST_INSERT_ID()
 # are replicated well
 ############################################################
@@ -14,15 +12,12 @@
 -- source include/master-slave.inc
 #should work for both SBR and RBR
 
-connection master;
 create table t1(a int auto_increment, primary key(a));
 create table t2(b int auto_increment, c int, primary key(b));
 insert into t1 values (1),(2),(3);
 insert into t1 values (null);
 insert into t2 values (null,last_insert_id());
-save_master_pos;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
 connection master;
@@ -41,9 +36,7 @@ insert into t1 values (null),(null),(null);
 insert into t2 values (5,0);
 insert into t2 values (null,last_insert_id());
 SET FOREIGN_KEY_CHECKS=1;
-save_master_pos;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 select * from t1;
 select * from t2;
 connection master;
@@ -59,17 +52,13 @@ insert into t1 values (null),(null),(null);
 insert into t2 values (5,0);
 insert into t2 (c) select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
-save_master_pos;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 select * from t1 ORDER BY a;
 select * from t2 ORDER BY b;
 connection master;
 drop table t1;
 drop table t2;
-save_master_pos;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 
 #
 # Bug#8412: Error codes reported in binary log for CHARACTER SET,
@@ -82,6 +71,10 @@ SET FOREIGN_KEY_CHECKS=0;
 # Duplicate Key Errors codes
 --error 1022, ER_DUP_ENTRY
 INSERT INTO t1 VALUES (1),(1);
-drop table t1;
 sync_slave_with_master;
+connection master;
+drop table t1;
+
 # End of 4.1 tests
+
+--source include/rpl_end.inc