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

Also fix one incorrect printf() format.

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;

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;

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

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

mysql-test/suite/binlog/r/binlog_consistent.result

@@ -3,11 +3,11 @@ RESET MASTER;
 CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb;
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	241		
+master-bin.000001	375		
 SHOW STATUS LIKE 'binlog_snapshot_%';
 Variable_name	Value
 binlog_snapshot_file	./master-bin.000001
-binlog_snapshot_position	241
+binlog_snapshot_position	375
 BEGIN;
 INSERT INTO t1 VALUES (0, "");
 # Connection con1
@@ -38,10 +38,10 @@ a	b
 SHOW STATUS LIKE 'binlog_snapshot_%';
 Variable_name	Value
 binlog_snapshot_file	./master-bin.000001
-binlog_snapshot_position	540
+binlog_snapshot_position	674
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	727		
+master-bin.000001	861		
 SELECT * FROM t2 ORDER BY a;
 a
 2
@@ -60,40 +60,40 @@ a	b
 SHOW STATUS LIKE 'binlog_snapshot_%';
 Variable_name	Value
 binlog_snapshot_file	./master-bin.000001
-binlog_snapshot_position	540
+binlog_snapshot_position	674
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000002	106		
+master-bin.000002	240		
 COMMIT;
 SHOW STATUS LIKE 'binlog_snapshot_%';
 Variable_name	Value
 binlog_snapshot_file	./master-bin.000002
-binlog_snapshot_position	106
+binlog_snapshot_position	240
 SHOW MASTER STATUS;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000002	106		
+master-bin.000002	240		
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: #, Binlog ver: #
-master-bin.000001	106	Query	1	241	use `test`; CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb
-master-bin.000001	241	Query	1	353	use `test`; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=myisam
-master-bin.000001	353	Query	1	421	BEGIN
-master-bin.000001	421	Query	1	513	use `test`; INSERT INTO t1 VALUES (0, "")
-master-bin.000001	513	Xid	1	540	COMMIT /* XID */
-master-bin.000001	540	Query	1	608	BEGIN
-master-bin.000001	608	Query	1	700	use `test`; INSERT INTO t1 VALUES (4, "")
-master-bin.000001	700	Xid	1	727	COMMIT /* XID */
-master-bin.000001	727	Query	1	795	BEGIN
-master-bin.000001	795	Query	1	887	use `test`; INSERT INTO t1 VALUES (1, "")
-master-bin.000001	887	Xid	1	914	COMMIT /* XID */
-master-bin.000001	914	Query	1	982	BEGIN
-master-bin.000001	982	Query	1	1079	use `test`; INSERT INTO t1 VALUES (2, "first")
-master-bin.000001	1079	Query	1	1167	use `test`; INSERT INTO t2 VALUES (2)
-master-bin.000001	1167	Query	1	1265	use `test`; INSERT INTO t1 VALUES (2, "second")
-master-bin.000001	1265	Xid	1	1292	COMMIT /* XID */
-master-bin.000001	1292	Query	1	1360	BEGIN
-master-bin.000001	1360	Query	1	1452	use `test`; INSERT INTO t1 VALUES (3, "")
-master-bin.000001	1452	Query	1	1540	use `test`; INSERT INTO t2 VALUES (3)
-master-bin.000001	1540	Xid	1	1567	COMMIT /* XID */
-master-bin.000001	1567	Rotate	1	1611	master-bin.000002;pos=4
+master-bin.000001	4	Format_desc	1	240	Server ver: #, Binlog ver: #
+master-bin.000001	240	Query	1	375	use `test`; CREATE TABLE t1 (a INT, b VARCHAR(100), PRIMARY KEY (a,b)) ENGINE=innodb
+master-bin.000001	375	Query	1	487	use `test`; CREATE TABLE t2 (a INT PRIMARY KEY) ENGINE=myisam
+master-bin.000001	487	Query	1	555	BEGIN
+master-bin.000001	555	Query	1	647	use `test`; INSERT INTO t1 VALUES (0, "")
+master-bin.000001	647	Xid	1	674	COMMIT /* XID */
+master-bin.000001	674	Query	1	742	BEGIN
+master-bin.000001	742	Query	1	834	use `test`; INSERT INTO t1 VALUES (4, "")
+master-bin.000001	834	Xid	1	861	COMMIT /* XID */
+master-bin.000001	861	Query	1	929	BEGIN
+master-bin.000001	929	Query	1	1021	use `test`; INSERT INTO t1 VALUES (1, "")
+master-bin.000001	1021	Xid	1	1048	COMMIT /* XID */
+master-bin.000001	1048	Query	1	1116	BEGIN
+master-bin.000001	1116	Query	1	1213	use `test`; INSERT INTO t1 VALUES (2, "first")
+master-bin.000001	1213	Query	1	1301	use `test`; INSERT INTO t2 VALUES (2)
+master-bin.000001	1301	Query	1	1399	use `test`; INSERT INTO t1 VALUES (2, "second")
+master-bin.000001	1399	Xid	1	1426	COMMIT /* XID */
+master-bin.000001	1426	Query	1	1494	BEGIN
+master-bin.000001	1494	Query	1	1586	use `test`; INSERT INTO t1 VALUES (3, "")
+master-bin.000001	1586	Query	1	1674	use `test`; INSERT INTO t2 VALUES (3)
+master-bin.000001	1674	Xid	1	1701	COMMIT /* XID */
+master-bin.000001	1701	Rotate	1	1745	master-bin.000002;pos=4
 DROP TABLE t1,t2;

mysql-test/t/group_commit_crash.test

@@ -65,6 +65,7 @@ while ($numtests)
 
   # table and binlog should be in sync.
   SELECT * FROM t1 ORDER BY id;
+--replace_column 2 # 5 #
   SHOW BINLOG EVENTS LIMIT 2,1;
 
   delete from t1;

mysql-test/t/innodb_release_row_locks_early.test

@@ -28,6 +28,8 @@ connect(c2,127.0.0.1,root,,test,$MASTER_MYPORT,);
 
 connection c1;
 --echo # Connection c1
+# Fix binlog format (otherwise SHOW BINLOG EVENTS will fluctuate).
+SET binlog_format= mixed;
 
 # First verify that row locks are released early.
 BEGIN;
@@ -38,6 +40,7 @@ send COMMIT;
 
     connection c2;
     --echo # Connection c2
+    SET binlog_format= mixed;
     SET DEBUG_SYNC="now WAIT_FOR c1_prepared";
     BEGIN;
     SELECT * FROM t1 WHERE k=1 FOR UPDATE;
@@ -75,6 +78,7 @@ connection c2;
 --echo # Connection c2
 reap;
 
+--replace_column 2 # 5 #
 --replace_regex /xid=[0-9]+/xid=XX/
 SHOW BINLOG EVENTS LIMIT 2,12;
 
@@ -121,6 +125,7 @@ connection c2;
 --echo # Connection c2
 reap;
 
+--replace_column 2 # 5 #
 --replace_regex /xid=[0-9]+/xid=XX/
 SHOW BINLOG EVENTS LIMIT 1,12;
 

storage/xtradb/fil/fil0fil.c

@@ -3313,7 +3313,8 @@ fil_open_single_table_tablespace(
 				}
 
 				if (page_is_corrupt) {
-					fprintf(stderr, " [errp:%lld]", offset / UNIV_PAGE_SIZE);
+					fprintf(stderr, " [errp:%ld]",
+						(long)(offset / UNIV_PAGE_SIZE));
 
 					/* cannot treat corrupt page */
 					goto skip_write;