more 4.1->5.0 merge fixes for bug#14553

mysql-test/r/rpl_insert_id.result:
  more merge fixes for bug#14553
mysql-test/t/rpl_insert_id.test:
  more merge fixes for bug#14553

mysql-test/r/rpl_insert_id.result

@@ -73,7 +73,7 @@ CREATE TABLE t1 ( a INT UNIQUE );
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
-drop table if exists t1, t2;
+drop table t1;
 create table t1(a int auto_increment, key(a));
 create table t2(a int);
 insert into t1 (a) values (null);

mysql-test/t/rpl_insert_id.test

@@ -82,7 +82,6 @@ sync_slave_with_master;
 # Bug#14553: NULL in WHERE resets LAST_INSERT_ID
 #
 connection master;
-drop table if exists t1,t2;
 create table t1(a int auto_increment, key(a));
 create table t2(a int);
 insert into t1 (a) values (null);