From 68cc0a34b7843a13004c5811f45576633190701c Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Fri, 1 Jun 2007 18:04:25 +0400
Subject: [PATCH 1/2] Fix a typo in the test case.

mysql-test/r/rpl_loaddata.result:
  Update result.
mysql-test/t/rpl_loaddata.test:
  Fix a typo in the test file.
---
 mysql-test/r/rpl_loaddata.result | 2 +-
 mysql-test/t/rpl_loaddata.test   | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index b4b8d8b9a07..be137079c7a 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -83,4 +83,4 @@ drop table t1;
 CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
 LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1;
 ERROR 23000: Duplicate entry 'Aarhus' for key 1
-DROP TABLE IF EXISTS t1;
+DROP TABLE t1;
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test
index 27fa7fb95a6..a4781ed4faa 100644
--- a/mysql-test/t/rpl_loaddata.test
+++ b/mysql-test/t/rpl_loaddata.test
@@ -158,9 +158,7 @@ CREATE TABLE t1 (word CHAR(20) NOT NULL PRIMARY KEY) ENGINE=INNODB;
 --error 1062
 LOAD DATA INFILE "../std_data_ln/words.dat" INTO TABLE t1;
 
---disable warnings
-DROP TABLE IF EXISTS t1;
---enable warnings
+DROP TABLE t1;
 
 sync_with_master;
 # End of 4.1 tests

From a00e5c6896e4a2d128aa7da5fabcb508ebd67f0f Mon Sep 17 00:00:00 2001
From: unknown <kostja@bodhi.(none)>
Date: Fri, 1 Jun 2007 18:06:40 +0400
Subject: [PATCH 2/2] Do not ignore mysqltest language interpreter warnings.

---
 .bzrignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index d1de21857db..8c632f8f890 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -708,7 +708,6 @@ mysql-test/r/*.err
 mysql-test/r/*.log
 mysql-test/r/*.out
 mysql-test/r/*.reject
-mysql-test/r/*.warnings
 mysql-test/r/alter_table.err
 mysql-test/r/archive.err
 mysql-test/r/bdb-alter-table-1.err