From cc1fd8141455f56fd443ebd75e3b62b9ba168f4f Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Tue, 7 Feb 2006 19:18:33 +0100
Subject: [PATCH] Update after merge 5.0 -> 5.1

---
 mysql-test/r/rpl_failed_optimize.result | 1 -
 mysql-test/r/rpl_insert_id.result       | 1 -
 mysql-test/r/rpl_loaddata.result        | 1 -
 mysql-test/r/rpl_loaddata_s.result      | 1 -
 mysql-test/r/rpl_multi_update3.result   | 1 -
 5 files changed, 5 deletions(-)

diff --git a/mysql-test/r/rpl_failed_optimize.result b/mysql-test/r/rpl_failed_optimize.result
index c2c07dc6343..fd711f89222 100644
--- a/mysql-test/r/rpl_failed_optimize.result
+++ b/mysql-test/r/rpl_failed_optimize.result
@@ -18,4 +18,3 @@ Table	Op	Msg_type	Msg_text
 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;
diff --git a/mysql-test/r/rpl_insert_id.result b/mysql-test/r/rpl_insert_id.result
index d7b6946f7e5..8482f631553 100644
--- a/mysql-test/r/rpl_insert_id.result
+++ b/mysql-test/r/rpl_insert_id.result
@@ -73,4 +73,3 @@ 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 t1;
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index f74476de678..03c370d2dd7 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -79,4 +79,3 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 ERROR 23000: Duplicate entry '2003-03-22' for key 1
 drop table t2;
 drop table t2;
-drop table t1;
diff --git a/mysql-test/r/rpl_loaddata_s.result b/mysql-test/r/rpl_loaddata_s.result
index 11f75d43bf9..86527b6d190 100644
--- a/mysql-test/r/rpl_loaddata_s.result
+++ b/mysql-test/r/rpl_loaddata_s.result
@@ -12,4 +12,3 @@ count(*)
 2
 show binlog events from 102;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-drop table t1;
diff --git a/mysql-test/r/rpl_multi_update3.result b/mysql-test/r/rpl_multi_update3.result
index bf454c7bb48..b81af7c6e39 100644
--- a/mysql-test/r/rpl_multi_update3.result
+++ b/mysql-test/r/rpl_multi_update3.result
@@ -194,4 +194,3 @@ idpro	price	nbprice
 1	1.0000	3
 2	1.0000	2
 3	2.0000	1
-drop table t1, t2;