From c34601adec43bcbf941de7a10d33374b49376e5c Mon Sep 17 00:00:00 2001
From: "lars/lthalmann@mysql.com/dl145j.mysql.com" <>
Date: Thu, 21 Sep 2006 13:04:33 +0200
Subject: [PATCH] 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 |  9 ++++++++-
 mysql-test/t/rpl_insert.test   | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/mysql-test/r/rpl_insert.result b/mysql-test/r/rpl_insert.result
index bcc9b176ed3..b6a97926f73 100644
--- a/mysql-test/r/rpl_insert.result
+++ b/mysql-test/r/rpl_insert.result
@@ -1,3 +1,6 @@
+#
+# 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;
diff --git a/mysql-test/t/rpl_insert.test b/mysql-test/t/rpl_insert.test
index 9beaff6bab6..0d471a0e0a9 100644
--- a/mysql-test/t/rpl_insert.test
+++ b/mysql-test/t/rpl_insert.test
@@ -1,7 +1,6 @@
-
-#
-# 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;
 
-connection master;
-DROP SCHEMA IF EXISTS mysqlslap;
-sync_slave_with_master;
+--echo #
+--echo # Cleanup
+--echo #
 
+connection master;
+USE test;
+DROP SCHEMA mysqlslap;
+sync_slave_with_master;