bk commit into 4.1 tree (aelkin:1.2477) BUG#14157

[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.2477 06/05/13 12:14:20 aelkin@stripped +2 -0
  BUG#14157: utf8 encoding in binlog without set character_set_client
  fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
  by default. 

  mysql-test/t/rpl_temporary.test
    1.18 06/05/13 12:14:17 aelkin@stripped +1 -1
    --character-sets-dir=../sql/share/charsets/

  mysql-test/t/mysqlbinlog.test
    1.18 06/05/13 12:14:17 aelkin@stripped +1 -1
    --character-sets-dir=../sql/share/charsets  is added otherwise client/.libs/lt-mysql
    searches in /usr/local/mysql ... A bug? 

# 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/Merge/4.1

--- 1.17/mysql-test/t/mysqlbinlog.test	2006-05-09 23:01:27 +03:00
+++ 1.18/mysql-test/t/mysqlbinlog.test	2006-05-13 12:14:17 +03:00
@@ -118,7 +118,7 @@
 #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

--- 1.17/mysql-test/t/rpl_temporary.test	2006-05-12 21:34:27 +03:00
+++ 1.18/mysql-test/t/rpl_temporary.test	2006-05-13 12:14:17 +03:00
@@ -164,7 +164,7 @@
 #
 #14157: utf8 encoding in binlog without set character_set_client
 #
 
 sync_slave_with_master;
 #connection slave;