Commit cd1eb672 authored by unknown's avatar unknown
Browse files

Result of a binlog_statement_insert_delayed was affected by recent fixing of 

  binlog_row_binlog.test failure in team tree.
  Fixing the result that gets wrong with --binlog-format=mixed
(so that skipped on pushbuild currently)


mysql-test/r/binlog_stm_binlog.result:
  Fixing the result.
parent 277b80da

mysql-test/r/binlog_stm_binlog.result

+14 −21
Original line number Diff line number Diff line
@@ -160,8 +160,22 @@ 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);

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Intvar	1	#	INSERT_ID=127

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

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

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

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
@@ -175,25 +189,4 @@ a 
306

400

401

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Intvar	1	#	INSERT_ID=127

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

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

master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)

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

drop table t1;