fix failed tests (ede9a262) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/extra/binlog_tests/blackhole.test

+13 −2

Original line number	Diff line number	Diff line
		@@ -126,8 +126,12 @@ select * from t2;
		select * from t3;

		let $VERSION=`select version()`;
		--replace_result $VERSION VERSION
		--replace_column 2 # 4 # 5 #
		--replace_regex /\/\* xid=.* \\//\/ XID *\// /table_id: [0-9]+/table_id: #/
		--replace_regex /file_id=[0-9]+/file_id=#/
		source include/show_binlog_events.inc;
		show binlog events;

		drop table t1,t2,t3;

		#
		@@ -170,7 +174,14 @@ start transaction;
		insert into t1 values(2);
		rollback;
		set autocommit=1;
		source include/show_binlog_events.inc;

		let $VERSION=`select version()`;
		--replace_result $VERSION VERSION
		--replace_column 2 # 4 # 5 #
		--replace_regex /\/\* xid=.* \\//\/ XID *\// /table_id: [0-9]+/table_id: #/
		--replace_regex /file_id=[0-9]+/file_id=#/
		show binlog events;

		drop table if exists t1;

		# End of 5.1 tests

mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test

+0 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		create temporary table tt (a int unique);
		create table ti (a int) engine=innodb;
		reset master;
		show master status;

		# action

		@@ -31,7 +30,6 @@ rollback;
		# check

		select count() from tt / 2 */;
		show master status;
		source include/show_binlog_events.inc;
		select count() from ti / zero */;
		insert into ti select * from tt;
		@@ -42,7 +40,6 @@ select * from ti /* that is what slave would miss - bug#28960 */;
		delete from ti;
		delete from tt where a=1;
		reset master;
		show master status;

		# action

		@@ -55,7 +52,6 @@ rollback;

		# check

		show master status;
		source include/show_binlog_events.inc; # nothing in binlog with row bilog format
		select count() from ti / zero */;
		insert into ti select * from tt;

mysql-test/suite/binlog/r/binlog_stm_blackhole.result

+6 −4

Original line number	Diff line number	Diff line
		@@ -104,8 +104,9 @@ select * from t2;
		a
		select * from t3;
		a
		show binlog events from <binlog_start>;
		show binlog events;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 # Format_desc # # Server ver: VERSION, Binlog ver: 4
		master-bin.000001 # Query # # use `test`; drop table t1,t2
		master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=blackhole
		master-bin.000001 # Query # # use `test`; BEGIN
		@@ -125,8 +126,8 @@ master-bin.000001 # Query # # use `test`; replace into t1 values(100)
		master-bin.000001 # Query # # use `test`; COMMIT
		master-bin.000001 # Query # # use `test`; create table t2 (a varchar(200)) engine=blackhole
		master-bin.000001 # Query # # use `test`; BEGIN
		master-bin.000001 # Begin_load_query # # ;file_id=1;block_len=581
		master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=1
		master-bin.000001 # Begin_load_query # # ;file_id=#;block_len=581
		master-bin.000001 # Execute_load_query # # use `test`; load data infile '../std_data_ln/words.dat' into table t2 ;file_id=#
		master-bin.000001 # Query # # use `test`; COMMIT
		master-bin.000001 # Query # # use `test`; alter table t1 add b int
		master-bin.000001 # Query # # use `test`; alter table t1 drop b
		@@ -162,8 +163,9 @@ start transaction;
		insert into t1 values(2);
		rollback;
		set autocommit=1;
		show binlog events from <binlog_start>;
		show binlog events;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 # Format_desc # # Server ver: VERSION, Binlog ver: 4
		master-bin.000001 # Query # # use `test`; create table t1 (a int) engine=blackhole
		master-bin.000001 # Query # # use `test`; BEGIN
		master-bin.000001 # Query # # use `test`; insert into t1 values(1)

mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result

+0 −12

Original line number	Diff line number	Diff line
		@@ -619,9 +619,6 @@ set @@session.binlog_format=statement;
		create temporary table tt (a int unique);
		create table ti (a int) engine=innodb;
		reset master;
		show master status;
		File Position Binlog_Do_DB Binlog_Ignore_DB
		master-bin.000001 106
		begin;
		insert into ti values (1);
		insert into ti values (2) ;
		@@ -632,9 +629,6 @@ Warning 1196 Some non-transactional changed tables couldn't be rolled back
		select count() from tt / 2 */;
		count(*)
		2
		show master status;
		File Position Binlog_Do_DB Binlog_Ignore_DB
		master-bin.000001 515
		show binlog events from <binlog_start>;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 # Query # # use `test`; BEGIN
		@@ -653,9 +647,6 @@ a
		delete from ti;
		delete from tt where a=1;
		reset master;
		show master status;
		File Position Binlog_Do_DB Binlog_Ignore_DB
		master-bin.000001 106
		begin;
		insert into ti values (1);
		insert into ti values (2) /* to make the dup error in the following */;
		@@ -664,9 +655,6 @@ ERROR 23000: Duplicate entry '2' for key 'a'
		rollback;
		Warnings:
		Warning 1196 Some non-transactional changed tables couldn't be rolled back
		show master status;
		File Position Binlog_Do_DB Binlog_Ignore_DB
		master-bin.000001 589
		show binlog events from <binlog_start>;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000001 # Query # # use `test`; BEGIN