After merge fix for bug N20396 (d9993548) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/binlog_row_ctype_ucs.result

+3 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,9 @@ master-bin.000001 102 Table_map 1 141 table_id: # (test.t2)
		master-bin.000001 141 Write_rows 1 231 table_id: # flags: STMT_END_F
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		ROLLBACK;
		DELIMITER /!/;
		ROLLBACK/!/;
		DELIMITER ;
		# End of log file
		ROLLBACK /* added by mysqlbinlog */;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;

mysql-test/r/rpl_row_mysqlbinlog.result

+52 −42

Original line number	Diff line number	Diff line
		@@ -154,13 +154,15 @@ c1 c3 c4 c5
		--- Test 2 position test --
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		use test;
		SET TIMESTAMP=1000000000;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
		SET @@session.sql_mode=0;
		/!\C latin1 /;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT);
		DELIMITER /!/;
		use test/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/!/;
		SET @@session.sql_mode=0/!/;
		/!\C latin1 //!/;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/!/;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT)/!/;
		DELIMITER ;
		# End of log file
		ROLLBACK /* added by mysqlbinlog */;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		@@ -168,20 +170,22 @@ ROLLBACK /* added by mysqlbinlog */;
		--- Test 3 First Remote test --
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		ROLLBACK;
		use test;
		SET TIMESTAMP=1000000000;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
		SET @@session.sql_mode=0;
		/!\C latin1 /;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
		DROP TABLE IF EXISTS t1,t2,t3;
		SET TIMESTAMP=1000000000;
		CREATE TABLE t1(word VARCHAR(20));
		SET TIMESTAMP=1000000000;
		CREATE TABLE t2(id INT AUTO_INCREMENT NOT NULL PRIMARY KEY);
		SET TIMESTAMP=1000000000;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT);
		DELIMITER /!/;
		ROLLBACK/!/;
		use test/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/!/;
		SET @@session.sql_mode=0/!/;
		/!\C latin1 //!/;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/!/;
		DROP TABLE IF EXISTS t1,t2,t3/!/;
		SET TIMESTAMP=1000000000/!/;
		CREATE TABLE t1(word VARCHAR(20))/!/;
		SET TIMESTAMP=1000000000/!/;
		CREATE TABLE t2(id INT AUTO_INCREMENT NOT NULL PRIMARY KEY)/!/;
		SET TIMESTAMP=1000000000/!/;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT)/!/;
		DELIMITER ;
		# End of log file
		ROLLBACK /* added by mysqlbinlog */;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		@@ -189,6 +193,8 @@ ROLLBACK /* added by mysqlbinlog */;
		--- Test 5 LOAD DATA --
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		DELIMITER /!/;
		DELIMITER ;
		# End of log file
		ROLLBACK /* added by mysqlbinlog */;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		@@ -196,20 +202,22 @@ ROLLBACK /* added by mysqlbinlog */;
		--- Test 6 reading stdin --
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		ROLLBACK;
		use test;
		SET TIMESTAMP=1000000000;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
		SET @@session.sql_mode=0;
		/!\C latin1 /;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
		DROP TABLE IF EXISTS t1,t2,t3;
		SET TIMESTAMP=1000000000;
		CREATE TABLE t1(word VARCHAR(20));
		SET TIMESTAMP=1000000000;
		CREATE TABLE t2(id INT AUTO_INCREMENT NOT NULL PRIMARY KEY);
		SET TIMESTAMP=1000000000;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT);
		DELIMITER /!/;
		ROLLBACK/!/;
		use test/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/!/;
		SET @@session.sql_mode=0/!/;
		/!\C latin1 //!/;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/!/;
		DROP TABLE IF EXISTS t1,t2,t3/!/;
		SET TIMESTAMP=1000000000/!/;
		CREATE TABLE t1(word VARCHAR(20))/!/;
		SET TIMESTAMP=1000000000/!/;
		CREATE TABLE t2(id INT AUTO_INCREMENT NOT NULL PRIMARY KEY)/!/;
		SET TIMESTAMP=1000000000/!/;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT)/!/;
		DELIMITER ;
		# End of log file
		ROLLBACK /* added by mysqlbinlog */;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;
		@@ -217,13 +225,15 @@ ROLLBACK /* added by mysqlbinlog */;
		--- Test 7 reading stdin w/position --
		/!40019 SET @@session.max_insert_delayed_threads=0/;
		/!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0/;
		use test;
		SET TIMESTAMP=1000000000;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
		SET @@session.sql_mode=0;
		/!\C latin1 /;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT);
		DELIMITER /!/;
		use test/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/!/;
		SET @@session.sql_mode=0/!/;
		/!\C latin1 //!/;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/!/;
		CREATE TABLE t3(c1 INT NOT NULL PRIMARY KEY, c2 LONGBLOB, c3 TIMESTAMP, c4 TEXT, c5 FLOAT)/!/;
		DELIMITER ;
		# End of log file
		ROLLBACK /* added by mysqlbinlog */;
		/!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE/;