Fixed bad merge and fixed some wrong test cases

mysql-test/t/rpl_magic.test

@@ -28,3 +28,4 @@ disable_rpl_parse;
 select * from t1;
 connection slave;
 select * from t1;
+drop table t1;

mysql-test/t/rpl_mystery22.test

 # test case to make slave thread get ahead by 22 bytes
 
+drop table if exists t1;
 source include/master-slave.inc;
 connection master;
 # first, cause a duplicate key problem on the slave

mysql-test/t/rpl_sporadic_master.test

@@ -19,9 +19,7 @@ connection master;
 insert into t1 values (NULL),(NULL);
 flush logs;
 truncate table t1;
-insert into t1 values (10),(NULL);
-insert into t1 values (NULL),(NULL)
-insert into t1 values (NULL),(NULL);
+insert into t1 values (10),(NULL),(NULL),(NULL),(NULL),(NULL);
 save_master_pos;
 connection slave;
 sync_with_master;