Commit e4bad7a8 authored Jan 08, 2008 by mats@unknown.kindahl.net

Post-merge fixes to make tests pass.

parent a9daa2cd

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/mysqlbinlog2.result

+226 −113

File changed.

Preview size limit exceeded, changes collapsed.

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;