From 85528e63a66f3f8fc335428b0104b17ea4250450 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 20 May 2006 12:34:56 +0300 Subject: [PATCH] #14157: utf8 encoding in binlog without set character_set_client fixing an issue with the test portability. mysql-test/t/mysqlbinlog.test: BUG#14157: utf8 encoding in binlog without set character_set_client fixing koi8r specific case to run on all platforms. client does not announce in cmd line any specific encoding but rather set it via `set names'. --- mysql-test/t/mysqlbinlog.test | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 6e3daaef0c3..bf966c2ef64 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -118,10 +118,12 @@ select HEX(f) from t4; #14157: utf8 encoding in binlog without set character_set_client # flush logs; ---exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table if not exists t5 (a int); set names koi8r; create temporary table `ΡέΙΛ` (a int); insert into `ΡέΙΛ` values (1); insert into t5 select * from `ΡέΙΛ`' +--exec $MYSQL test -e 'create table if not exists t5 (a int); set names koi8r; create temporary table `δφόΔΦά` (a int); insert into `δφόΔΦά` values (1); insert into t5 select * from `δφόΔΦά`' -# resulted log is client charset insensitive (latin1 not koi8r) as it must be ---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000006 | $MYSQL --default-character-set=latin1 +# resulted binlog, parly consisting of multi-byte utf8 chars, +# must be digestable for both client and server. In 4.1 the client +# should use default-character-set same as the server. +--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000006 | $MYSQL select * from t5 /* must be (1),(1) */; # clean up