Post merge fixes of result files.

mysql-test/r/binlog_stm_binlog.result:
  Result change.
mysql-test/r/binlog_stm_ctype_ucs.result:
  Result change.
mysql-test/r/binlog_stm_insert_select.result:
  Result change.
mysql-test/r/ctype_cp932_binlog_stm.result:
  Result change.
mysql-test/r/flush_block_commit_notembedded.result:
  Result change.
mysql-test/r/rpl_000015.result:
  Result change.
mysql-test/r/rpl_change_master.result:
  Result change.
mysql-test/r/rpl_deadlock_innodb.result:
  Result change.
mysql-test/r/rpl_flushlog_loop.result:
  Result change.
mysql-test/r/rpl_known_bugs_detection.result:
  Result change.
mysql-test/r/rpl_loaddata.result:
  Result change.
mysql-test/r/rpl_loaddata_s.result:
  Result change.
mysql-test/r/rpl_log_pos.result:
  Result change.
mysql-test/r/rpl_rbr_to_sbr.result:
  Result change.
mysql-test/r/rpl_rotate_logs.result:
  Result change.
mysql-test/r/rpl_row_max_relay_size.result:
  Result change.
mysql-test/r/rpl_server_id1.result:
  Result change.
mysql-test/r/rpl_server_id2.result:
  Result change.
mysql-test/r/rpl_sp.result:
  Result change.
mysql-test/r/rpl_stm_charset.result:
  Result change.
mysql-test/r/rpl_stm_flsh_tbls.result:
  Result change.
mysql-test/r/rpl_stm_log.result:
  Result change.
mysql-test/r/rpl_stm_max_relay_size.result:
  Result change.
mysql-test/r/rpl_stm_multi_query.result:
  Result change.
mysql-test/r/rpl_stm_reset_slave.result:
  Result change.
mysql-test/r/rpl_stm_until.result:
  Result change.
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Result change.
mysql-test/r/rpl_truncate_2myisam.result:
  Result change.
mysql-test/r/rpl_truncate_3innodb.result:
  Result change.
mysql-test/r/rpl_truncate_7ndb.result:
  Result change.
mysql-test/r/user_var-binlog.result:
  Result change.

1 files changed, 15 insertions, 15 deletions

diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index 8f0cf29ab34..cea84dba1ef 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -16,7 +16,7 @@ create table t1 (s text);
 insert into t1 values('Could not break slave'),('Tried hard');
 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	60	master-bin.000001	555	#	#	master-bin.000001	Yes	Yes				#			0		0	555	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	60	master-bin.000001	556	#	#	master-bin.000001	Yes	Yes				#			0		0	556	#	None		0	No						#
 select * from t1;
 s
 Could not break slave
@@ -27,9 +27,9 @@ insert into t2 values (34),(67),(123);
 flush logs;
 show binary logs;
 Log_name	File_size
-master-bin.000001	599
-master-bin.000002	370
-master-bin.000003	105
+master-bin.000001	600
+master-bin.000002	371
+master-bin.000003	106
 create table t3 select * from temp_table;
 select * from t3;
 a
@@ -43,21 +43,21 @@ start slave;
 purge master logs to 'master-bin.000002';
 show master logs;
 Log_name	File_size
-master-bin.000002	370
-master-bin.000003	414
+master-bin.000002	371
+master-bin.000003	415
 purge binary logs to 'master-bin.000002';
 show binary logs;
 Log_name	File_size
-master-bin.000002	370
-master-bin.000003	414
+master-bin.000002	371
+master-bin.000003	415
 purge master logs before now();
 show binary logs;
 Log_name	File_size
-master-bin.000003	414
+master-bin.000003	415
 insert into t2 values (65);
 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	60	master-bin.000003	503	#	#	master-bin.000003	Yes	Yes				#			0		0	503	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	60	master-bin.000003	504	#	#	master-bin.000003	Yes	Yes				#			0		0	504	#	None		0	No						#
 select * from t2;
 m
 34
@@ -74,18 +74,18 @@ count(*)
 create table t4 select * from temp_table;
 show binary logs;
 Log_name	File_size
-master-bin.000003	4192
-master-bin.000004	4197
-master-bin.000005	2039
+master-bin.000003	4193
+master-bin.000004	4198
+master-bin.000005	2040
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000005	2039		
+master-bin.000005	2040		
 select * from t4;
 a
 testing temporary tables part 2
 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	60	master-bin.000005	2039	#	#	master-bin.000005	Yes	Yes				#			0		0	2039	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	60	master-bin.000005	2040	#	#	master-bin.000005	Yes	Yes				#			0		0	2040	#	None		0	No						#
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)