Commit df8b4a06 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1 

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/t/rpl_temporary.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  manual merge
parents b9558d8b d388da98

mysql-test/t/mysqlbinlog.test

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ select HEX(f) from t4; 
#14157: utf8 encoding in binlog without set character_set_client

#

flush logs;

--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 `    `'

--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
@@ -135,4 +135,4 @@ select * from t5 /* must be (1),(1) */; 
# clean up

drop table t1, t2, t03, t04, t3, t4, t5; 



# End of 4.1 tests
 
# End of 5.0 tests

mysql-test/t/rpl_temporary.test

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ drop table t1; 
#

#14157: utf8 encoding in binlog without set character_set_client

#

--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 `ÔÏÌØËÏ ÇÅÒÏÉ ÓÒÅÚÁÀÔ ÒÁÛÐÉÌÅÍ ÇÒÉÍ`'

--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;