Fixes to make tests pass in pushbuild. (4f7ad14b) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/mysqlbinlog.result

+4 −4

Original line number	Diff line number	Diff line
		@@ -39,16 +39,16 @@ SET TIMESTAMP=1000000000/!/;
		insert into t2 values ()
		/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-2-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-3-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-4-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		DELIMITER ;
		# End of log file

+1 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ select "--- Local --" as "";
		#

		--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
		--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
		--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000001

		# this should not fail but shouldn't produce any working statements