summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2006-05-28 14:23:28 -0700
committerigor@rurik.mysql.com <>2006-05-28 14:23:28 -0700
commitcb4c6a0dede7873aa151042b5f0aff9f545a5a89 (patch)
tree410e53bfffea6664a34fc1dbbc97dd430b3c49f3
parent377b3e0306b0b5ba8769ad23689f1aa6d92a0fdc (diff)
parent6119b7136e55348ba88ce20ca3db4d3d64115d55 (diff)
downloadmariadb-git-cb4c6a0dede7873aa151042b5f0aff9f545a5a89.tar.gz
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
-rw-r--r--mysql-test/t/mysqlbinlog.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index bf966c2ef64..0e4d16efb64 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -115,10 +115,10 @@ 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
#
flush logs;
---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 `漩周`'
+--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 binlog, parly consisting of multi-byte utf8 chars,
# must be digestable for both client and server. In 4.1 the client