From 62be79a2e6208873240fb0a3dafbb99f24c9e577 Mon Sep 17 00:00:00 2001
From: unknown <aelkin@mysql.com>
Date: Sat, 13 May 2006 12:14:20 +0300
Subject: [PATCH] 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/mysqlbinlog.test:
  --character-sets-dir=../sql/share/charsets  is added otherwise client/.libs/lt-mysql
  searches in /usr/local/mysql ... A bug?
mysql-test/t/rpl_temporary.test:
  --character-sets-dir=../sql/share/charsets/
---
 mysql-test/t/mysqlbinlog.test   | 2 +-
 mysql-test/t/rpl_temporary.test | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index 11aa5814bda..7b6c36bb8c9 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -118,7 +118,7 @@ select HEX(f) from t4;
 #14157: utf8 encoding in binlog without set character_set_client
 #
 flush logs;
---exec $MYSQL --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
diff --git a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
index 1276b635b74..609e8533849 100644
--- a/mysql-test/t/rpl_temporary.test
+++ b/mysql-test/t/rpl_temporary.test
@@ -164,7 +164,7 @@ drop table t1;
 #
 #14157: utf8 encoding in binlog without set character_set_client
 #
---exec $MYSQL --default-character-set=koi8r test -e 'create table t1 (a int); set names koi8r; create temporary table `только герои срезают рашпилем грим` (a int); insert into `только герои срезают рашпилем грим` values (1); insert into t1 select * from `только герои срезают рашпилем грим`'
+--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table t1 (a int); set names koi8r; create temporary table `только герои срезают рашпилем грим` (a int); insert into `только герои срезают рашпилем грим` values (1); insert into t1 select * from `только герои срезают рашпилем грим`'
 
 sync_slave_with_master;
 #connection slave;