Commit daebc0d6 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/4.1-bug14157-utf8_binlog 

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1
parents db2556fd c23c38fa

mysql-test/r/drop_temp_table.result

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ master-bin.000001 # Query 1 # create database `drop-temp+table-test` 
master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn1 (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table `table:name` (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn2 (a int)

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; SET ONE_SHOT CHARACTER_SET_CLIENT=33,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=8

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn2`,`drop-temp+table-test`.`table:name`,`drop-temp+table-test`.`shortn1`

master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DO RELEASE_LOCK("a")

drop database `drop-temp+table-test`;

mysql-test/r/mix_innodb_myisam_binlog.result

+3 −2
Original line number Diff line number Diff line
@@ -249,7 +249,8 @@ master-bin.000001 1056 Query 1 1056 use `test`; insert t0 select * from t1 
master-bin.000001	1117	Query	1	1117	use `test`; DO RELEASE_LOCK("a")

master-bin.000001	1172	Query	1	1172	use `test`; insert into t0 select GET_LOCK("lock1",null)

master-bin.000001	1251	Query	1	1251	use `test`; create table t2 (n int) engine=innodb

master-bin.000001	1323	Query	1	1323	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`

master-bin.000001	1424	Query	1	1424	use `test`; DO RELEASE_LOCK("lock1")

master-bin.000001	1323	Query	1	1323	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=33,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=8

master-bin.000001	1457	Query	1	1457	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`

master-bin.000001	1558	Query	1	1558	use `test`; DO RELEASE_LOCK("lock1")

do release_lock("lock1");

drop table t0,t2;

mysql-test/r/mysqlbinlog.result

+6 −1
Original line number Diff line number Diff line
@@ -101,4 +101,9 @@ HEX(f) 
select HEX(f) from t4;

HEX(f)

835C

drop table t1, t2, t03, t04, t3, t4;
 
flush logs;

select * from t5  /* must be (1),(1) */;

a

1

1

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

mysql-test/r/rpl_temporary.result

+4 −0
Original line number Diff line number Diff line
@@ -103,3 +103,7 @@ select * from t1 /* must be 1 */; 
f

1

drop table t1;

select * from t1;

a

1

drop table t1;

mysql-test/t/mysqlbinlog.test

+10 −1
Original line number Diff line number Diff line
@@ -114,8 +114,17 @@ select HEX(f) from t3; 
select HEX(f) from t04;

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



# 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

select * from t5  /* must be (1),(1) */;



# clean up

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

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



# End of 4.1 tests