bk commit into 5.0 tree (lars:1.2145)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2145 06/05/16 10:01:07 lars@stripped +2 -0
  Test used a charset not available on many platforms

  mysql-test/t/mysqlbinlog.test
    1.27 06/05/16 10:00:52 lars@stripped +10 -5
    Test used a charset not available on many platforms

  mysql-test/r/mysqlbinlog.result
    1.23 06/05/16 10:00:52 lars@stripped +1 -5
    Test used a charset not available on many platforms

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-rpl

--- 1.22/mysql-test/r/mysqlbinlog.result	2006-05-13 19:01:54 +02:00
+++ 1.23/mysql-test/r/mysqlbinlog.result	2006-05-16 10:00:52 +02:00
@@ -190,8 +190,4 @@
 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;

--- 1.26/mysql-test/t/mysqlbinlog.test	2006-05-14 19:50:11 +02:00
+++ 1.27/mysql-test/t/mysqlbinlog.test	2006-05-16 10:00:52 +02:00
@@ -123,16 +123,21 @@
 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