After-merge fixes for MWL#47 (which causes changes in binlog positions in .result files).

Also fix one incorrect printf() format.

4 files changed, 33 insertions, 31 deletions

diff --git a/mysql-test/r/group_commit_binlog_pos.result b/mysql-test/r/group_commit_binlog_pos.result
index 67ae30bbb79..bfeb2474edb 100644
--- a/mysql-test/r/group_commit_binlog_pos.result
+++ b/mysql-test/r/group_commit_binlog_pos.result
@@ -30,6 +30,6 @@ a
 1
 2
 3
-InnoDB: Last MySQL binlog file position 0 767, file name ./master-bin.000001
+InnoDB: Last MySQL binlog file position 0 901, file name ./master-bin.000001
 SET DEBUG_SYNC= 'RESET';
 DROP TABLE t1;
diff --git a/mysql-test/r/group_commit_crash.result b/mysql-test/r/group_commit_crash.result
index 46b6a05a2da..a55d8f29dda 100644
--- a/mysql-test/r/group_commit_crash.result
+++ b/mysql-test/r/group_commit_crash.result
@@ -60,7 +60,7 @@ a	b	c	d	9
 a	b	c	d	10
 SHOW BINLOG EVENTS LIMIT 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	174	Query	1	268	use `test`; insert into t1 select * from t2
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t2
 delete from t1;
 SET binlog_format= mixed;
 RESET MASTER;
@@ -83,7 +83,7 @@ a	b	c	d	9
 a	b	c	d	10
 SHOW BINLOG EVENTS LIMIT 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	174	Query	1	268	use `test`; insert into t1 select * from t2
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t2
 delete from t1;
 SET binlog_format= mixed;
 RESET MASTER;
@@ -106,7 +106,7 @@ a	b	c	d	9
 a	b	c	d	10
 SHOW BINLOG EVENTS LIMIT 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	174	Query	1	268	use `test`; insert into t1 select * from t2
+master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t2
 delete from t1;
 SET binlog_format= mixed;
 RESET MASTER;
diff --git a/mysql-test/r/innodb_release_row_locks_early.result b/mysql-test/r/innodb_release_row_locks_early.result
index eb40f73d97d..d544dc8df1f 100644
--- a/mysql-test/r/innodb_release_row_locks_early.result
+++ b/mysql-test/r/innodb_release_row_locks_early.result
@@ -7,11 +7,13 @@ INSERT INTO t1 (k, a, b, c) VALUES (4, 0, 0, 0);
 RESET MASTER;
 SET DEBUG_SYNC= 'RESET';
 # Connection c1
+SET binlog_format= mixed;
 BEGIN;
 UPDATE t1 SET a=10 WHERE k=1;
 SET DEBUG_SYNC="commit_after_release_LOCK_prepare_ordered SIGNAL c1_prepared WAIT_FOR c2_committing";
 COMMIT;
 # Connection c2
+SET binlog_format= mixed;
 SET DEBUG_SYNC="now WAIT_FOR c1_prepared";
 BEGIN;
 SELECT * FROM t1 WHERE k=1 FOR UPDATE;
@@ -41,17 +43,17 @@ Warning	1639	debug sync point wait timed out
 # Connection c2
 SHOW BINLOG EVENTS LIMIT 2,12;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	174	Query	1	265	use `test`; UPDATE t1 SET a=10 WHERE k=1
-master-bin.000001	265	Xid	1	292	COMMIT /* xid=XX */
-master-bin.000001	292	Query	1	360	BEGIN
-master-bin.000001	360	Query	1	451	use `test`; UPDATE t1 SET a=20 WHERE k=1
-master-bin.000001	451	Xid	1	478	COMMIT /* xid=XX */
-master-bin.000001	478	Query	1	546	BEGIN
-master-bin.000001	546	Query	1	637	use `test`; UPDATE t1 SET a=10 WHERE k=2
-master-bin.000001	637	Xid	1	664	COMMIT /* xid=XX */
-master-bin.000001	664	Query	1	732	BEGIN
-master-bin.000001	732	Query	1	823	use `test`; UPDATE t1 SET a=20 WHERE k=2
-master-bin.000001	823	Xid	1	850	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=10 WHERE k=1
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=20 WHERE k=1
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=10 WHERE k=2
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=20 WHERE k=2
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
 # Connection c1
 RESET MASTER;
 SET DEBUG_SYNC="commit_after_release_LOCK_prepare_ordered SIGNAL c1_prepared WAIT_FOR c2_committing";
@@ -80,18 +82,18 @@ Warning	1639	debug sync point wait timed out
 # Connection c2
 SHOW BINLOG EVENTS LIMIT 1,12;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	106	Query	1	174	BEGIN
-master-bin.000001	174	Query	1	265	use `test`; UPDATE t1 SET a=10 WHERE k=3
-master-bin.000001	265	Xid	1	292	COMMIT /* xid=XX */
-master-bin.000001	292	Query	1	360	BEGIN
-master-bin.000001	360	Query	1	451	use `test`; UPDATE t1 SET a=20 WHERE k=3
-master-bin.000001	451	Xid	1	478	COMMIT /* xid=XX */
-master-bin.000001	478	Query	1	546	BEGIN
-master-bin.000001	546	Query	1	637	use `test`; UPDATE t1 SET a=10 WHERE k=4
-master-bin.000001	637	Xid	1	664	COMMIT /* xid=XX */
-master-bin.000001	664	Query	1	732	BEGIN
-master-bin.000001	732	Query	1	823	use `test`; UPDATE t1 SET a=20 WHERE k=4
-master-bin.000001	823	Xid	1	850	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=10 WHERE k=3
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=20 WHERE k=3
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=10 WHERE k=4
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
+master-bin.000001	#	Query	1	#	BEGIN
+master-bin.000001	#	Query	1	#	use `test`; UPDATE t1 SET a=20 WHERE k=4
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=XX */
 SELECT * FROM t1 ORDER BY k;
 k	a	b	c
 1	20	0	0
diff --git a/mysql-test/r/mysqldump-max.result b/mysql-test/r/mysqldump-max.result
index d4509b51923..aaa31f8b45d 100644
--- a/mysql-test/r/mysqldump-max.result
+++ b/mysql-test/r/mysqldump-max.result
@@ -334,10 +334,10 @@ DROP TABLE t1;
 DROP TABLE t2;
 SHOW BINLOG EVENTS LIMIT 6,3;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	524	Query	1	592	BEGIN
-master-bin.000001	592	Query	1	689	use `test`; INSERT INTO t2 VALUES (1,0), (2,0)
-master-bin.000001	689	Xid	1	716	COMMIT /* XID */
--- CHANGE MASTER TO MASTER_LOG_FILE='./master-bin.000001', MASTER_LOG_POS=716;
+master-bin.000001	658	Query	1	726	BEGIN
+master-bin.000001	726	Query	1	823	use `test`; INSERT INTO t2 VALUES (1,0), (2,0)
+master-bin.000001	823	Xid	1	850	COMMIT /* XID */
+-- CHANGE MASTER TO MASTER_LOG_FILE='./master-bin.000001', MASTER_LOG_POS=850;
 SELECT * FROM t1 ORDER BY a;
 a
 1