Commit f17e0754 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/t/rpl_temporary.test:
  Manual merge
parents 2e70c581 44994c9d

mysql-test/t/rpl_temporary.test

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

#14157: utf8 encoding in binlog without set character_set_client

#

--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test -e 'create table t1 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t1 select * from `äöüÄÖÜ`'

--write_file $MYSQLTEST_VARDIR/tmp/bug14157.sql

create table t1 (a int);

set names latin1;

create temporary table `äöüÄÖÜ` (a int);

insert into `äöüÄÖÜ` values (1);

insert into t1 select * from `äöüÄÖÜ`

EOF

--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test < $MYSQLTEST_VARDIR/tmp/bug14157.sql



sync_slave_with_master;

#connection slave;