Commit 27696712 authored by aelkin@mysql.com's avatar aelkin@mysql.com
Browse files

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.
parent a0b4c8ed

mysql-test/t/mysqlbinlog.test

+1 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/t/rpl_temporary.test

+1 −1
Original line number Diff line number Diff line
@@ -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;