Commit dc125bb3 authored by unknown's avatar unknown
Browse files

BUG#17095 (Cluster RBR in circle does not terminate): 

Updating result files with wrong server id for BEGIN and COMMIT
events.


mysql-test/r/rpl_ndb_log.result:
  Result mismatch.
parent 5ca905a6

mysql-test/r/rpl_ndb_log.result

+6 −6
Original line number Diff line number Diff line
@@ -99,33 +99,33 @@ show binlog events in 'slave-bin.000001' from 4; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB

slave-bin.000001	#	Query	1	#	BEGIN

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

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

slave-bin.000001	#	Query	1	#	COMMIT

slave-bin.000001	#	Query	2	#	COMMIT

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

slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB

slave-bin.000001	#	Query	1	#	BEGIN

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	1	#	table_id: #

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

slave-bin.000001	#	Query	1	#	COMMIT

slave-bin.000001	#	Query	2	#	COMMIT

slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB

slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4

show binlog events in 'slave-bin.000002' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB

slave-bin.000002	#	Query	1	#	BEGIN

slave-bin.000002	#	Query	2	#	BEGIN

slave-bin.000002	#	Table_map	2	#	table_id: # (test.t2)

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000002	#	Write_rows	2	#	table_id: #

slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000002	#	Query	1	#	COMMIT

slave-bin.000002	#	Query	2	#	COMMIT

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master	Master_SSL_Verify_Server_Cert

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	617	#	#	master-bin.000002	Yes	Yes				#			0		0	617	#	None		0	No						#	No