From 2275faa00e62e752d70221fcc6cc5c16bcd04d3a Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Tue, 7 Jul 2009 16:09:06 +0300
Subject: [PATCH] fixed a failing test ctype_gbk_binlog : Table 't2' already
 exists

---
 mysql-test/r/ctype_gbk_binlog.result | 1 +
 mysql-test/t/ctype_gbk_binlog.test   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/mysql-test/r/ctype_gbk_binlog.result b/mysql-test/r/ctype_gbk_binlog.result
index a49e170ff19..39cf21d5a63 100644
--- a/mysql-test/r/ctype_gbk_binlog.result
+++ b/mysql-test/r/ctype_gbk_binlog.result
@@ -14,6 +14,7 @@ SET @`tcontent`:=_binary 0x50434B000900000000000000E9000000 COLLATE `binary`/*!*
 CALL p1(@`tcontent`);
 FLUSH LOGS;
 DROP PROCEDURE p1;
+DROP TABLE IF EXISTS t2;
 RENAME TABLE t1 to t2;
 SELECT hex(f1) FROM t2;
 hex(f1)
diff --git a/mysql-test/t/ctype_gbk_binlog.test b/mysql-test/t/ctype_gbk_binlog.test
index a8f653d1b1e..114c1c8385f 100644
--- a/mysql-test/t/ctype_gbk_binlog.test
+++ b/mysql-test/t/ctype_gbk_binlog.test
@@ -24,6 +24,9 @@ CALL p1(@`tcontent`);
 
 FLUSH LOGS;
 DROP PROCEDURE p1;
+--disable_warnings
+DROP TABLE IF EXISTS t2;
+--enable_warnings
 RENAME TABLE t1 to t2;
 
 let $MYSQLD_DATADIR= `select @@datadir`;