If mysqlslap schema does not exists, it should be an error, so no need for IF EXISTS

Setting default database back to 'test', so that next test case don't use the wrong database


mysql-test/r/rpl_insert.result:
  result file update

mysql-test/r/rpl_insert.result

+#
+# Bug#20821: INSERT DELAYED fails to write some rows to binlog
+#
 stop slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
@@ -13,4 +16,8 @@ COUNT(*)
 SELECT COUNT(*) FROM mysqlslap.t1;
 COUNT(*)
 5000
-DROP SCHEMA IF EXISTS mysqlslap;
+#
+# Cleanup
+#
+USE test;
+DROP SCHEMA mysqlslap;

mysql-test/t/rpl_insert.test

-
-#
-# Bug#20821: INSERT DELAYED fails to write some rows to binlog
-#
+--echo #
+--echo # Bug#20821: INSERT DELAYED fails to write some rows to binlog
+--echo #
 
 --source include/master-slave.inc
 --source include/not_embedded.inc
@@ -35,7 +34,11 @@ SELECT COUNT(*) FROM mysqlslap.t1;
 sync_slave_with_master;
 SELECT COUNT(*) FROM mysqlslap.t1;
 
+--echo #
+--echo # Cleanup
+--echo #
+
 connection master;
-DROP SCHEMA IF EXISTS mysqlslap;
+USE test;
+DROP SCHEMA mysqlslap;
 sync_slave_with_master;
-