Commit 3d5289c2 authored by Sven Sandberg's avatar Sven Sandberg
Browse files

BUG#38068: binlog_stm_binlog fails sporadically in pushbuild 

Post-push fix: updated some result files that were affected
by the previous fix to this bug.
parent fc0f2481

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "kil 
ERROR 70100: Query execution was interrupted

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12

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

master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=#

select

(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))

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

+2 −2
Original line number Diff line number Diff line
@@ -1141,10 +1141,10 @@ master-bin.000001 # Delete_rows # # table_id: # flags: STMT_END_F 
master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

drop table t1,t2,t3,tt1;

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

insert delayed into t1 values (207);

insert delayed into t1 values (null);

insert delayed into t1 values (300);

FLUSH TABLES;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)
@@ -1188,9 +1188,9 @@ master-bin.000001 # Query # # use `test`; BEGIN 
master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES

insert delayed into t1 values (null),(null),(null),(null);

insert delayed into t1 values (null),(null),(400),(null);

11 == 11

select * from t1;

a

207

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

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Intvar	#	#	INSERT_ID=10

master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci

master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12

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

master-bin.000001	#	Intvar	#	#	INSERT_ID=10

master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci

master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#

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

+2 −2
Original line number Diff line number Diff line 
create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

insert delayed into t1 values (207);

insert delayed into t1 values (null);

insert delayed into t1 values (300);

FLUSH TABLES;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
@@ -10,9 +10,9 @@ master-bin.000001 # Query # # use `test`; insert delayed into t1 values (207) 
master-bin.000001	#	Intvar	#	#	INSERT_ID=208

master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (null)

master-bin.000001	#	Query	#	#	use `test`; insert delayed into t1 values (300)

master-bin.000001	#	Query	#	#	use `test`; FLUSH TABLES

insert delayed into t1 values (null),(null),(null),(null);

insert delayed into t1 values (null),(null),(400),(null);

11 == 11

select * from t1;

a

207

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

+2 −2
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ show binlog events from <binlog_start>; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Intvar	#	#	INSERT_ID=10

master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12

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

master-bin.000001	#	Intvar	#	#	INSERT_ID=10

master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#

master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
@@ -858,7 +858,7 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Intvar	#	#	INSERT_ID=10

master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci

master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12

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

master-bin.000001	#	Intvar	#	#	INSERT_ID=10

master-bin.000001	#	User var	#	#	@`b`=_latin1 0x3135 COLLATE latin1_swedish_ci

master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t4 (a, @b) set b= @b + bug27417(2) ;file_id=#