Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new


mysql-test/r/binlog_stm_drop_tmp_tbl.result:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_stm_until.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/r/rpl_stm_until.result:
  Manual merge
mysql-test/t/rpl_temporary.test:
  Manual merge
sql/sql_base.cc:
  Manual merge

1 files changed, 14 insertions, 1 deletions

diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index 1bede1d5c9a..b76a5103120 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -124,9 +124,22 @@ select HEX(f) from t3;
 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.
+#
+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 `ΡέΙΛ`'
 
+# 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) */;
 
 # clean up
 drop table t1, t2, t03, t04, t3, t4; 
 
-# End of 4.1 tests
+# End of 5.0 tests