bk commit into 4.1 tree (aelkin:1.2480)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
4.1 repository of elkin. When elkin 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.2480 06/05/20 12:51:17 aelkin@stripped +1 -0
  #14157: utf8 encoding in binlog without set character_set_client
  
  Avoiding --default-character-set in command line. The same effect is achieved via
  set names, being a portable solution. 

  mysql-test/t/mysqlbinlog.test
    1.20 06/05/20 12:51:14 aelkin@stripped +5 -3
    fixing koi8r specific case for portability.

# 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:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug14157-utf8_binlog_testcases_tt

--- 1.19/mysql-test/t/mysqlbinlog.test	2006-05-14 20:09:05 +03:00
+++ 1.20/mysql-test/t/mysqlbinlog.test	2006-05-20 12:51:14 +03:00
@@ -118,10 +118,12 @@
 #14157: utf8 encoding in binlog without set character_set_client
 #
 flush logs;
 
-# 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
+# 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 $MYSQL_TEST_DIR/var/log/master-bin.000006 | $MYSQL
 select * from t5  /* must be (1),(1) */;
 
 # clean up