fixed a failing test ctype_gbk_binlog : Table 't2' already exists

e52358fa · Georgi Kodinov · af1f8c6d · e52358fa · e52358fa
Commit e52358fa authored Jul 07, 2009 by Georgi Kodinov
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

mysql-test/r/ctype_gbk_binlog.result mysql-test/r/ctype_gbk_binlog.result +1 -0

mysql-test/t/ctype_gbk_binlog.test mysql-test/t/ctype_gbk_binlog.test +3 -0

No files found.
--- 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)

--- 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`;