bk commit into 5.0 tree (aelkin:1.2156) BUG#14157

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 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.2156 06/05/31 19:49:38 aelkin@stripped +1 -0
  Bug#14157: utf8 encoding in binlog without set character_set_client
  
  adapting to pushbuild's custom to switch from default pathes. The name for
  var directory must be set with MYSQLTEST_VARDIR.

  mysql-test/t/mysqlbinlog.test
    1.30 06/05/31 19:49:32 aelkin@stripped +1 -1
    correction of log path since pushbuild uses non-default options.

# 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:	dl145k.mysql.com
# Root:	/tmp/andrei/MERGE/5.0

--- 1.29/mysql-test/t/mysqlbinlog.test	2006-05-31 12:51:15 +02:00
+++ 1.30/mysql-test/t/mysqlbinlog.test	2006-05-31 19:49:32 +02:00
@@ -131,7 +131,7 @@
 # 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
+--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
 select * from t5  /* must be (1),(1) */;
 
 # clean up