post-merge test fixes

mysql-test/r/rpl_ndb_log.result

@@ -89,12 +89,12 @@ master-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000002	#	Query	1	#	COMMIT
 show binary logs;
 Log_name	File_size
-master-bin.000001	1734
-master-bin.000002	596
+master-bin.000001	1774
+master-bin.000002	616
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1829
+slave-bin.000001	1869
 slave-bin.000002	201
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -129,7 +129,7 @@ slave-bin.000002	#	Write_rows	2	#	table_id: # flags: STMT_END_F
 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
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	596	#	#	master-bin.000002	Yes	Yes				#			0		0	596	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	616	#	#	master-bin.000002	Yes	Yes				#			0		0	616	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
 DROP TABLE t1;

mysql-test/r/rpl_truncate_7ndb.result

@@ -33,13 +33,13 @@ master-bin.000001	4	Format_desc	1	105	Server ver: SERVER_VERSION, Binlog ver: 4
 master-bin.000001	105	Query	1	222	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
 master-bin.000001	222	Query	1	286	BEGIN
 master-bin.000001	286	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	326	Table_map	1	95	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	381	Write_rows	1	137	table_id: #
-master-bin.000001	423	Write_rows	1	175	table_id: #
-master-bin.000001	461	Write_rows	1	213	table_id: # flags: STMT_END_F
-master-bin.000001	499	Query	1	564	COMMIT
-master-bin.000001	564	Query	1	644	use `test`; TRUNCATE TABLE t1
-master-bin.000001	644	Query	1	720	use `test`; DROP TABLE t1
+master-bin.000001	326	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	384	Write_rows	1	157	table_id: #
+master-bin.000001	443	Write_rows	1	195	table_id: #
+master-bin.000001	481	Write_rows	1	233	table_id: # flags: STMT_END_F
+master-bin.000001	519	Query	1	584	COMMIT
+master-bin.000001	584	Query	1	664	use `test`; TRUNCATE TABLE t1
+master-bin.000001	664	Query	1	740	use `test`; DROP TABLE t1
 **** On Master ****
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
@@ -70,26 +70,26 @@ master-bin.000001	4	Format_desc	1	105	Server ver: SERVER_VERSION, Binlog ver: 4
 master-bin.000001	105	Query	1	222	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
 master-bin.000001	222	Query	1	286	BEGIN
 master-bin.000001	286	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	326	Table_map	1	95	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	381	Write_rows	1	137	table_id: #
-master-bin.000001	423	Write_rows	1	175	table_id: #
-master-bin.000001	461	Write_rows	1	213	table_id: # flags: STMT_END_F
-master-bin.000001	499	Query	1	564	COMMIT
-master-bin.000001	564	Query	1	644	use `test`; TRUNCATE TABLE t1
-master-bin.000001	644	Query	1	720	use `test`; DROP TABLE t1
-master-bin.000001	720	Query	1	837	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	837	Query	1	901	BEGIN
-master-bin.000001	901	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	941	Table_map	1	95	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	996	Write_rows	1	137	table_id: #
-master-bin.000001	1038	Write_rows	1	175	table_id: #
-master-bin.000001	1076	Write_rows	1	213	table_id: # flags: STMT_END_F
-master-bin.000001	1114	Query	1	1179	COMMIT
-master-bin.000001	1179	Query	1	1243	BEGIN
-master-bin.000001	1243	Table_map	1	40	table_id: # (test.t1)
-master-bin.000001	1283	Table_map	1	95	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	1338	Write_rows	1	137	table_id: #
-master-bin.000001	1380	Delete_rows	1	171	table_id: #
-master-bin.000001	1414	Delete_rows	1	205	table_id: # flags: STMT_END_F
-master-bin.000001	1448	Query	1	1513	COMMIT
-master-bin.000001	1513	Query	1	1589	use `test`; DROP TABLE t1
+master-bin.000001	326	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	384	Write_rows	1	157	table_id: #
+master-bin.000001	443	Write_rows	1	195	table_id: #
+master-bin.000001	481	Write_rows	1	233	table_id: # flags: STMT_END_F
+master-bin.000001	519	Query	1	584	COMMIT
+master-bin.000001	584	Query	1	664	use `test`; TRUNCATE TABLE t1
+master-bin.000001	664	Query	1	740	use `test`; DROP TABLE t1
+master-bin.000001	740	Query	1	857	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	857	Query	1	921	BEGIN
+master-bin.000001	921	Table_map	1	40	table_id: # (test.t1)
+master-bin.000001	961	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	1019	Write_rows	1	157	table_id: #
+master-bin.000001	1078	Write_rows	1	195	table_id: #
+master-bin.000001	1116	Write_rows	1	233	table_id: # flags: STMT_END_F
+master-bin.000001	1154	Query	1	1219	COMMIT
+master-bin.000001	1219	Query	1	1283	BEGIN
+master-bin.000001	1283	Table_map	1	40	table_id: # (test.t1)
+master-bin.000001	1323	Table_map	1	98	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	1381	Write_rows	1	157	table_id: #
+master-bin.000001	1440	Delete_rows	1	191	table_id: #
+master-bin.000001	1474	Delete_rows	1	225	table_id: # flags: STMT_END_F
+master-bin.000001	1508	Query	1	1573	COMMIT
+master-bin.000001	1573	Query	1	1649	use `test`; DROP TABLE t1