bk commit into 5.1 tree (lars:1.2342)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-09-21 13:04:33+02:00, lars@stripped +2 -0
  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@stripped, 2006-09-21 13:04:30+02:00, lars@stripped +8 -1
    result file update

  mysql-test/t/rpl_insert.test@stripped, 2006-09-21 13:04:30+02:00, lars@stripped +9 -6
    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

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/MERGE/mysql-5.1-merge

--- 1.2/mysql-test/r/rpl_insert.result	2006-09-21 13:04:48 +02:00
+++ 1.3/mysql-test/r/rpl_insert.result	2006-09-21 13:04:48 +02:00
@@ -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;

--- 1.5/mysql-test/t/rpl_insert.test	2006-09-21 13:04:48 +02:00
+++ 1.6/mysql-test/t/rpl_insert.test	2006-09-21 13:04:48 +02:00
@@ -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;
 
+--echo #
+--echo # Cleanup
+--echo #
+
 connection master;
-DROP SCHEMA IF EXISTS mysqlslap;
+USE test;
+DROP SCHEMA mysqlslap;
 sync_slave_with_master;
-