Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

into  dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases

1 files 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