BUG#20980932 MYSQLBINLOG GENERATES 'ROLLBACK' AFTER FD EVENT CAUSING

1782 ERRRO mysqlbinlog prints "ROLLBACK" at the end of binlog file. The ROLLBACK caused the error that "@@SESSION.GTID_NEXT cannot be set to ANONYMOUS when @@GLOBAL.GTID_MODE = ON." It happened in below cases: - Binlog file doesn't include any data related events. e.g. master-bin.1 only includes: Format_description_log_event Rotate_log_event and mysqlbinlog master-bin.1 master-bin.2 will output: BINLOG '... Format_description_log_event of master-bin.1...' ROLLBACK BINLOG '... Format_description_log_event of master-bin.2...' - Relay log file includes a Format_description_log_event of master which is generated at starting server. e.g. the relay log includes: Format_description_log_event of relay log Format_description_log_event of master(generated when starting server) and mysqlbinlog output: BINLOG '... the binary of relay log's Format_description_log_event' ROLLBACK BINLOG '... the binary of master's Format_description_log_event' When applying a Format_description_log_event, gtid_next's status will be changed to NOT_YET_DETERMINDED_GROUP, so gtid_next will be decided by the following event. If it is an Gtid_log_event, then it will be set to gtid_next, otherwise ANONYMOUS is set. For above two cases, It will set gtid_next to ANONYMOUS when applying ROLLBACK, but gtid_mode is on, so it throws an error. The fix has two parts: - ROLLBACK is not printed out if there is no uncomplete transaction at the end of the binlog. SET @SESSION.GTID_NEXT = 'AUTOMATIC' is always printed at the end of each binlog, even the binlog is empty. It fixes the first case. - Format_description_log_event of relay log is not output as a 'BINLOG'. it fixes the second case.
kamil-holubicki · Sep 11, 2015 · d048c0f · d048c0f
1 parent 8f1bfe9
commit d048c0f
Show file tree

Hide file tree

Showing 37 changed files with 566 additions and 358 deletions.
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
@@ -351,8 +351,8 @@ if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
   is not null;
   --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
   eval select
-  @a like "%#%error_code=0%ROLLBACK\\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%" OR
-  @a like "%#%error_code=0%ROLLBACK\\r\\n/*!*/;%ROLLBACK /* added by mysqlbinlog */;%",
+  @a like "%#%error_code=0%ROLLBACK\\n/*!*/;%" OR
+  @a like "%#%error_code=0%ROLLBACK\\r\\n/*!*/;%",
   @a not like "%#%error_code=%error_code=%";
 }
 drop table t1, t2;

diff --git a/mysql-test/include/mysqlbinlog.inc b/mysql-test/include/mysqlbinlog.inc
@@ -25,8 +25,15 @@ if ($rpl_debug)
   --echo $MYSQL_BINLOG $mysqlbinlog_parameters $mysqlbinlog_pipe
 }
 
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---replace_regex /TIMESTAMP=[0-9]*/TIMESTAMP=#/ /#[0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* server id [0-9]*/# # server id #/ /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /last_committed=[0-9]*/last_committed=#/ /sequence_number=[0-9]*/sequence_number=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #/ /Start: binlog v [0-9]*/Start: binlog v #/ /created [0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* at startup/created # at startup/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= '#'/ /CRC32 0x[0-9a-f]{8}/CRC32 #/ /# [a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}:/# #:/
+if ($mysqlbinlog_skip_replace)
+{
+  --echo DO_NOT_CHECK_IN_THIS_LINE: printing unfiltered mysqlbinlog output. This should only be used for debugging. Never check in a result file that contains unfiltered mysqlbinlog output.
+}
+if (!$mysqlbinlog_skip_replace)
+{
+  --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+  --replace_regex /TIMESTAMP=[0-9]*/TIMESTAMP=#/ /#[0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* server id [0-9]*/# # server id #/ /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/ /exec_time=[0-9]*/exec_time=#/ /last_committed=[0-9]*/last_committed=#/ /sequence_number=[0-9]*/sequence_number=#/ /end_log_pos [0-9]*/end_log_pos #/ /# at [0-9]*/# at #/ /Xid = [0-9]*/Xid = #/ /thread_id=[0-9]*/thread_id=#/ /table id [0-9]*/table id #/ /mapped to number [0-9]*/mapped to number #/ /server v [^ ]*/server v #/ /Start: binlog v [0-9]*/Start: binlog v #/ /created [0-9]*[ ]*[0-9]*:[0-9]*:[0-9]* at startup/created # at startup/ /(@[0-9]*=[0-9-]*[.][0-9]{1,3})[0-9e+-]*[^ ]*[ ]*(.*(FLOAT|DOUBLE).*[*].)/\1... \2/ /SET @@SESSION.GTID_NEXT= '.*'/SET @@SESSION.GTID_NEXT= '#'/ /CRC32 0x[0-9a-f]{8}/CRC32 #/ /# [a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}:/# #:/
+}
 --exec $MYSQL_BINLOG --ssl $mysqlbinlog_parameters $mysqlbinlog_pipe
 
 

diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
@@ -95,7 +95,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- Broken LOAD DATA --
@@ -146,7 +145,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- --database --
@@ -208,7 +206,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- --start-position --
@@ -238,7 +235,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- Remote --
@@ -323,7 +319,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- Broken LOAD DATA --
@@ -374,7 +369,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- --database --
@@ -436,7 +430,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- --start-position --
@@ -466,7 +459,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 --- reading stdin --
@@ -486,9 +478,10 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 insert t1 values (1)
 /*!*/;
+ROLLBACK /* added by mysqlbinlog */ /*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 include/mysqlbinlog.inc
@@ -506,9 +499,10 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 insert t1 values (1)
 /*!*/;
+ROLLBACK /* added by mysqlbinlog */ /*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 drop table t1,t2;
@@ -577,7 +571,6 @@ end
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 call p1();
@@ -715,7 +708,6 @@ DROP TABLE `t1` /* generated by server */
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 CREATE TABLE t1 (c1 CHAR(10));
@@ -854,9 +846,9 @@ insert into t5 (a) values (3)
 SET TIMESTAMP=#/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -890,9 +882,9 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 COMMIT
 /*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -901,6 +893,7 @@ include/mysqlbinlog.inc
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 SET TIMESTAMP=#/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@@ -935,9 +928,9 @@ SET TIMESTAMP=#/*!*/;
 INSERT INTO db1.t1 VALUES(50)
 /*!*/;
 COMMIT/*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -946,6 +939,7 @@ include/mysqlbinlog.inc
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=1*/;
 /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
 DELIMITER /*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 SET TIMESTAMP=#/*!*/;
 SET @@session.pseudo_thread_id=#/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
@@ -965,9 +959,9 @@ SET TIMESTAMP=#/*!*/;
 ROLLBACK TO mixed_cases
 /*!*/;
 COMMIT/*!*/;
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 End of 5.0 tests
@@ -1027,9 +1021,9 @@ AAAAAAAAAAAAAAAAAAArki87
 '/*!*/;
 # at #
 # # server id #  end_log_pos # 	Stop
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 

diff --git a/mysql-test/r/user_var-binlog.result b/mysql-test/r/user_var-binlog.result
@@ -59,7 +59,6 @@ COMMIT
 SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 drop table t1;
diff --git a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result
@@ -51,9 +51,10 @@ CREATE TABLE t1 (a int) engine = myisam
 BEGIN
 /*!*/;
 # at 305
-<#>DELIMITER ;
+<#>ROLLBACK /* added by mysqlbinlog */ /*!*/;
+SET @@SESSION.GTID_NEXT= 'AUTOMATIC' /* added by mysqlbinlog */ /*!*/;
+DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 ==== Test non-matching FD event and Row event ====

diff --git a/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row.result
@@ -5029,11 +5029,10 @@ SET @@SESSION.GTID_NEXT= '#'/*!*/;
 SET TIMESTAMP=#/*!*/;
 DROP TABLE `t1`,`t2` /* generated by server */
 /*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
diff --git a/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_innodb.result
@@ -3819,12 +3819,11 @@ BEGIN
 # at #
 # # server id #  end_log_pos # CRC32 # 	Xid = #
 COMMIT/*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -4128,12 +4127,11 @@ BEGIN
 # at #
 # # server id #  end_log_pos # CRC32 # 	Xid = #
 COMMIT/*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -4863,12 +4861,11 @@ BEGIN
 # at #
 # # server id #  end_log_pos # CRC32 # 	Xid = #
 COMMIT/*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -4982,12 +4979,11 @@ BEGIN
 # at #
 # # server id #  end_log_pos # CRC32 # 	Xid = #
 COMMIT/*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #

diff --git a/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result
@@ -3841,12 +3841,11 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 COMMIT
 /*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -4156,12 +4155,11 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 COMMIT
 /*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -4901,12 +4899,11 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 COMMIT
 /*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #
@@ -5022,12 +5019,11 @@ BEGIN
 SET TIMESTAMP=#/*!*/;
 COMMIT
 /*!*/;
-SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 # at #
 # # server id #  end_log_pos # CRC32 # 	Rotate to master-bin.000002  pos: 4
+SET @@SESSION.GTID_NEXT= '#' /* added by mysqlbinlog */ /*!*/;
 DELIMITER ;
 # End of log file
-ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
 /*!50530 SET @@SESSION.PSEUDO_SLAVE_MODE=0*/;
 #