Added clarification comment regarding added ROLLBACK to mysqlbinlog output (906cd821) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqlbinlog.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -1434,7 +1434,7 @@ int main(int argc, char** argv)
		of transaction.
		*/
		fprintf(result_file,
		"ROLLBACK;\n"
		"# End of log file\nROLLBACK;\n"
		"/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;\n");
		if (disable_log_bin)
		fprintf(result_file, "/!32316 SET SQL_LOG_BIN=@OLD_SQL_LOG_BIN/;\n");

mysql-test/r/ctype_ucs_binlog.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ 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 t2 values (@v);
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		drop table t2;

mysql-test/r/mysqlbinlog.result

+10 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ SET TIMESTAMP=1000000000;
		load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-3-0' INTO table t1;
		SET TIMESTAMP=1000000000;
		load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-4-0' INTO table t1;
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -51,6 +52,7 @@ 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 ("Alas");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -59,6 +61,7 @@ ROLLBACK;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		ROLLBACK;
		SET INSERT_ID=1;
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -71,6 +74,7 @@ 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 ("Alas");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -101,6 +105,7 @@ SET TIMESTAMP=1000000000;
		load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-3-2' INTO table t1;
		SET TIMESTAMP=1000000000;
		load data LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/SQL_LOAD_MB-4-2' INTO table t1;
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -113,6 +118,7 @@ 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 ("Alas");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -121,6 +127,7 @@ ROLLBACK;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		ROLLBACK;
		SET INSERT_ID=1;
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -133,6 +140,7 @@ 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 ("Alas");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -145,6 +153,7 @@ SET TIMESTAMP=1108844556;
		BEGIN;
		SET TIMESTAMP=1108844555;
		insert t1 values (1);
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		@@ -154,6 +163,7 @@ SET TIMESTAMP=1108844556;
		BEGIN;
		SET TIMESTAMP=1108844555;
		insert t1 values (1);
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		drop table t1, t2;

mysql-test/r/mysqlbinlog2.result

+25 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -65,6 +66,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -81,6 +83,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -103,6 +106,7 @@ insert into t1 values(null, "b");
		SET INSERT_ID=3;
		SET TIMESTAMP=1579609944;
		insert into t1 values(null, "c");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -123,6 +127,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -142,6 +147,7 @@ insert into t1 values(null, "a");
		SET INSERT_ID=2;
		SET TIMESTAMP=1579609942;
		insert into t1 values(null, "b");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -177,6 +183,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -210,6 +217,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -233,6 +241,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -262,6 +271,7 @@ SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		SET INSERT_ID=6;
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -289,6 +299,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -308,6 +319,7 @@ insert into t1 values(null, "a");
		SET INSERT_ID=2;
		SET TIMESTAMP=1579609942;
		insert into t1 values(null, "b");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -336,6 +348,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -362,6 +375,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -378,6 +392,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -400,6 +415,7 @@ insert into t1 values(null, "b");
		SET INSERT_ID=3;
		SET TIMESTAMP=1579609944;
		insert into t1 values(null, "c");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -420,6 +436,7 @@ insert into t1 values(null, "d");
		SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -439,6 +456,7 @@ insert into t1 values(null, "a");
		SET INSERT_ID=2;
		SET TIMESTAMP=1579609942;
		insert into t1 values(null, "b");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -474,6 +492,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -507,6 +526,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -530,6 +550,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -559,6 +580,7 @@ SET INSERT_ID=5;
		SET TIMESTAMP=1579609946;
		insert into t1 values(null, "e");
		SET INSERT_ID=6;
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -586,6 +608,7 @@ 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");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -605,6 +628,7 @@ insert into t1 values(null, "a");
		SET INSERT_ID=2;
		SET TIMESTAMP=1579609942;
		insert into t1 values(null, "b");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

		@@ -636,6 +660,7 @@ insert into t1 values(null, "e");
		SET INSERT_ID=6;
		SET TIMESTAMP=1579609943;
		insert into t1 values(null, "f");
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

mysql-test/r/rpl_charset.result

+1 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ 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 (', ',', ');
		# End of log file
		ROLLBACK;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		drop table t1;