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 d74bb1c3a80..c2cd15c3f0f 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -123,21 +123,18 @@ select HEX(f) from t04; select HEX(f) from t4; # -# BUG#14157: utf8 encoding in binlog without set character_set_client -# -# BUG: -# This test only works on the MySQL-internal rpl machines. -# Needs to be fixed. Problem is that koi8r is not installed -# on many machines. +#BUG#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 latin1; 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 -#select * from t5 /* must be (1),(1) */; +# 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 $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL +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