From 1b701050e4d89f2f0d9f5a2d27dfa03a16921b3b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 31 May 2006 12:51:21 +0200 Subject: [PATCH] BUG#14157: utf8 encoding in binlog without set character_set_client missed table to drop after merge from 4.1 mysql-test/r/mysqlbinlog.result: result changed mysql-test/t/mysqlbinlog.test: manual merge post-fix --- mysql-test/r/mysqlbinlog.result | 6 +++++- mysql-test/t/mysqlbinlog.test | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 664833fab2a..c3be791b523 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -190,4 +190,8 @@ select HEX(f) from t4; HEX(f) 835C flush logs; -drop table t1, t2, t03, t04, t3, t4; +select * from t5 /* must be (1),(1) */; +a +1 +1 +drop table t1, t2, t03, t04, t3, t4, t5; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 135bc4191f6..aa0e45e5c84 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -135,6 +135,6 @@ flush logs; select * from t5 /* must be (1),(1) */; # clean up -drop table t1, t2, t03, t04, t3, t4; +drop table t1, t2, t03, t04, t3, t4, t5; # End of 5.0 tests