post-review fixes. Now ROLLBACK is done in Format_description_log_event

mysql-test/t/mix_innodb_myisam_binlog.test:
  fix for --ps-protocol

8 files changed, 38 insertions, 11 deletions

diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index 26f29164af6..881da636617 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -527,8 +527,8 @@ show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	96	User var	1	136	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
 master-bin.000001	136	Query	1	226	use `test`; insert into t2 values (@v)
-flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;
 use test;
 SET TIMESTAMP=10000;
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 601f7d6ae7e..ee0047934ab 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -15,6 +15,7 @@ flush logs;
 
 --- Local --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1000000000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -47,6 +48,7 @@ insert into t1 values ("Alas");
 
 --- --database --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 
 --- --position --
@@ -60,6 +62,7 @@ insert into t1 values ("Alas");
 
 --- Remote --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1000000000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -92,6 +95,7 @@ insert into t1 values ("Alas");
 
 --- --database --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 
 --- --position --
@@ -105,13 +109,12 @@ insert into t1 values ("Alas");
 
 --- reading stdin --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1065204671;
 BEGIN;
-ROLLBACK;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
 use test;
 SET TIMESTAMP=1065204671;
 BEGIN;
-ROLLBACK;
 drop table t1, t2;
diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/r/mysqlbinlog2.result
index fd4279e65a8..8fdaa5bed4e 100644
--- a/mysql-test/r/mysqlbinlog2.result
+++ b/mysql-test/r/mysqlbinlog2.result
@@ -16,6 +16,7 @@ insert into t1 values(null, "f");
 
 --- Local --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -40,6 +41,7 @@ insert into t1 values(null, "e");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -75,6 +77,7 @@ insert into t1 values(null, "e");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -93,6 +96,7 @@ insert into t1 values(null, "c");
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -109,6 +113,7 @@ insert into t1 values(null, "e");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -124,6 +129,7 @@ insert into t1 values(null, "b");
 
 --- Local with 2 binlogs on command line --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -152,10 +158,10 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
-ROLLBACK;
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -182,7 +188,6 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
-ROLLBACK;
 
 --- start-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -203,10 +208,10 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
-ROLLBACK;
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -232,6 +237,7 @@ SET INSERT_ID=6;
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -252,10 +258,10 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
-ROLLBACK;
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -271,6 +277,7 @@ insert into t1 values(null, "b");
 
 --- Remote --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -295,6 +302,7 @@ insert into t1 values(null, "e");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -330,6 +338,7 @@ insert into t1 values(null, "e");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -348,6 +357,7 @@ insert into t1 values(null, "c");
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -364,6 +374,7 @@ insert into t1 values(null, "e");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -379,6 +390,7 @@ insert into t1 values(null, "b");
 
 --- Remote with 2 binlogs on command line --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -410,6 +422,7 @@ insert into t1 values(null, "f");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -459,6 +472,7 @@ insert into t1 values(null, "f");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -484,6 +498,7 @@ SET INSERT_ID=6;
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -507,6 +522,7 @@ insert into t1 values(null, "f");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -522,6 +538,7 @@ insert into t1 values(null, "b");
 
 --- to-last-log --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result
index c92368c6407..d105e208777 100644
--- a/mysql-test/r/rpl_charset.result
+++ b/mysql-test/r/rpl_charset.result
@@ -175,6 +175,7 @@ select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET TIMESTAMP=1000000000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
 SET @@session.sql_mode=0;
@@ -244,5 +245,4 @@ CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
 SET TIMESTAMP=1000000000;
 SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30;
 INSERT INTO t1 (c1, c2) VALUES ('Ну, за рыбалку','Ну, за рыбалку');
-ROLLBACK;
 drop table t1;
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index 16249f3c779..511ef5e3188 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -181,8 +181,8 @@ master-bin.000001	137	Query	1	230	use `test`; INSERT INTO t1 VALUES(@`a b`)
 master-bin.000001	230	User var	1	272	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
 master-bin.000001	272	User var	1	310	@`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
 master-bin.000001	310	Query	1	411	use `test`; insert into t1 values (@var1),(@var2)
-flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`;
 use test;
 SET TIMESTAMP=10000;
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index a648e78a3c7..05552fcc6c5 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -339,7 +339,6 @@ set @v=convert('abc' using ucs2);
 reset master;
 insert into t2 values (@v);
 show binlog events from 96;
-flush logs;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).
diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index d8872fa6a1a..08a81c850eb 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -26,6 +26,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
+--replace_result "xid=12" "xid=7"
 show binlog events from 96;
 
 delete from t1;
@@ -54,6 +55,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
+--replace_result "xid=45" "xid=24"
 show binlog events from 96;
 
 delete from t1;
@@ -71,6 +73,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
+--replace_result "xid=67" "xid=36"
 show binlog events from 96;
 
 # and when ROLLBACK is not explicit?
@@ -103,6 +106,7 @@ insert into t1 values(9);
 insert into t2 select * from t1;
 
 --replace_column 5 #
+--replace_result "xid=116" "xid=59"
 show binlog events from 96;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
@@ -115,11 +119,13 @@ insert into t1 values(10); # first make t1 non-empty
 begin;
 insert into t2 select * from t1;
 --replace_column 5 #
+--replace_result "xid=130" "xid=65"
 show binlog events from 96;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
+--replace_result "xid=130" "xid=65" "xid=133" "xid=67"
 show binlog events from 96;
 
 
@@ -138,6 +144,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
+--replace_result "xid=152" "xid=77"
 show binlog events from 96;
 
 delete from t1;
@@ -165,6 +172,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
+--replace_result "xid=184" "xid=93"
 show binlog events from 96;
 
 delete from t1;
@@ -182,6 +190,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
+--replace_result "xid=205" "xid=104"
 show binlog events from 96;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index 07c38094fe1..5dc24bde21f 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -111,7 +111,6 @@ set @var1= "';aaa";
 SET @var2=char(ascii('a'));
 insert into t1 values (@var1),(@var2);
 show binlog events from 96;
-flush logs;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).