Commit e2676d0f authored by hezx@mail.hezx.com's avatar hezx@mail.hezx.com
Browse files

Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0 

into  mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.0-rpl
parents 44a318ef 5a5672d6

mysql-test/r/binlog_start_comment.result

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ flush logs; 
select * from t2;

word

Ada

drop table t1,t2;

mysql-test/r/blackhole.result

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values(1) 
master-bin.000001	#	Query	1	#	use `test`; insert ignore into t1 values(1)

master-bin.000001	#	Query	1	#	use `test`; replace into t1 values(100)

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole

master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581

master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=1

master-bin.000001	#	Begin_load_query	1	#	;file_id=#;block_len=581

master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=#

master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int

master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b

master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1

mysql-test/r/case.result

+1 −1
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1, t2;

select CASE "b" when "a" then 1 when "b" then 2 END;

CASE "b" when "a" then 1 when "b" then 2 END

2

mysql-test/t/blackhole.test

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ select * from t3; 
let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /file_id=[0-9]+/file_id=#/

show binlog events;



drop table t1,t2,t3;

mysql-test/t/case.test

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



--disable_warnings

drop table if exists t1;

drop table if exists t1, t2;

--enable_warnings



select CASE "b" when "a" then 1 when "b" then 2 END;