bk commit into 5.1 tree (msvensson:1.2085)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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
  1.2085 06/02/07 19:18:33 msvensson@neptunus.(none) +5 -0
  Update after merge 5.0 -> 5.1

  mysql-test/r/rpl_multi_update3.result
    1.6 06/02/07 19:18:28 msvensson@neptunus.(none) +0 -1
    Updates test result

  mysql-test/r/rpl_loaddata_s.result
    1.11 06/02/07 19:18:28 msvensson@neptunus.(none) +0 -1
    Updates test result

  mysql-test/r/rpl_loaddata.result
    1.33 06/02/07 19:18:27 msvensson@neptunus.(none) +0 -1
    Updates test result

  mysql-test/r/rpl_insert_id.result
    1.14 06/02/07 19:18:27 msvensson@neptunus.(none) +0 -1
    Updates test result

  mysql-test/r/rpl_failed_optimize.result
    1.5 06/02/07 19:18:27 msvensson@neptunus.(none) +0 -1
    Updates test result

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new

--- 1.5/mysql-test/r/rpl_multi_update3.result	2006-01-26 17:54:26 +01:00
+++ 1.6/mysql-test/r/rpl_multi_update3.result	2006-02-07 19:18:28 +01:00
@@ -194,4 +194,3 @@
 1	1.0000	3
 2	1.0000	2
 3	2.0000	1
-drop table t1, t2;

--- 1.10/mysql-test/r/rpl_loaddata_s.result	2006-02-07 18:03:38 +01:00
+++ 1.11/mysql-test/r/rpl_loaddata_s.result	2006-02-07 19:18:28 +01:00
@@ -12,4 +12,3 @@
 2
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-drop table t1;

--- 1.4/mysql-test/r/rpl_failed_optimize.result	2006-01-26 17:54:26 +01:00
+++ 1.5/mysql-test/r/rpl_failed_optimize.result	2006-02-07 19:18:27 +01:00
@@ -18,4 +18,3 @@
 test.non_existing	optimize	error	Table 'test.non_existing' doesn't exist
 Warnings:
 Error	1146	Table 'test.non_existing' doesn't exist
-drop table t1;

--- 1.13/mysql-test/r/rpl_insert_id.result	2006-01-26 17:54:26 +01:00
+++ 1.14/mysql-test/r/rpl_insert_id.result	2006-02-07 19:18:27 +01:00
@@ -73,4 +73,3 @@
 SET FOREIGN_KEY_CHECKS=0;
 INSERT INTO t1 VALUES (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
-drop table t1;

--- 1.32/mysql-test/r/rpl_loaddata.result	2006-02-07 18:03:38 +01:00
+++ 1.33/mysql-test/r/rpl_loaddata.result	2006-02-07 19:18:27 +01:00
@@ -79,4 +79,3 @@
 ERROR 23000: Duplicate entry '2003-03-22' for key 1
 drop table t2;
 drop table t2;
-drop table t1;