From 808f77f6b003bbd225c21905b0f204bbcb61d457 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 May 2006 10:01:07 +0200 Subject: [PATCH] Test used a charset not available on many platforms --- mysql-test/r/mysqlbinlog.result | 6 +----- mysql-test/t/mysqlbinlog.test | 15 ++++++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index c3be791b523..664833fab2a 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -190,8 +190,4 @@ select HEX(f) from t4; HEX(f) 835C flush logs; -select * from t5 /* must be (1),(1) */; -a -1 -1 -drop table t1, t2, t03, t04, t3, t4, t5; +drop table t1, t2, t03, t04, t3, t4; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 843536e956d..d74bb1c3a80 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -123,16 +123,21 @@ select HEX(f) from t04; select HEX(f) from t4; # -#14157: utf8 encoding in binlog without set character_set_client +# 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. # 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 --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 `ÑÝÉË`' # 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) */; +# --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) */; # clean up -drop table t1, t2, t03, t04, t3, t4, t5; +drop table t1, t2, t03, t04, t3, t4; # End of 5.0 tests