Merge rurik.mysql.com:/home/igor/mysql-4.1

into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0

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