bk commit into 5.1 tree (aelkin:1.2187)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of aelkin. When aelkin 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.2187 06/06/01 22:32:33 aelkin@stripped +3 -0
  Merge dl145h.mysql.com:/tmp/andrei/MERGE/5.0_my
  into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1

  sql/sql_class.cc
    1.263 06/06/01 22:32:24 aelkin@stripped +0 -0
    Auto merged

  sql/ha_ndbcluster.cc
    1.313 06/06/01 22:32:24 aelkin@stripped +0 -2
    Auto merged

  mysql-test/t/mysqlbinlog.test
    1.26 06/06/01 22:32:24 aelkin@stripped +0 -0
    Auto merged

# 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:	aelkin
# Host:	dl145h.mysql.com
# Root:	/tmp/andrei/MERGE/5.1/RESYNC

--- 1.25/mysql-test/t/mysqlbinlog.test	2006-05-18 18:08:15 +02:00
+++ 1.26/mysql-test/t/mysqlbinlog.test	2006-06-01 22:32:24 +02:00
@@ -125,21 +125,18 @@
 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.
+#BUG#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 latin1; 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) */;
+# 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 $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
+select * from t5  /* must be (1),(1) */;
 
 # clean up
-drop table t1, t2, t03, t04, t3, t4; 
+drop table t1, t2, t03, t04, t3, t4, t5; 
 
 # End of 5.0 tests