Again blanking out some numbers in file names that is dependent (e00096a1) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/mysqlbinlog.result

+8 −8

Original line number	Diff line number	Diff line
		@@ -127,16 +127,16 @@ SET TIMESTAMP=1000000000/!/;
		insert into t2 values ()
		/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-1-2' 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-2' 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-2' 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-2' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		DELIMITER ;
		# End of log file
		@@ -317,18 +317,18 @@ SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.
		create table t1 (a varchar(64) character set utf8)
		/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-6-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=7/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-7-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=DEFAULT/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-8-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-9-0' INTO table t1
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO table t1
		/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=7/!/;

mysql-test/t/mysqlbinlog.test

+11 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ select "--- Local --" as "";
		select "--- Broken LOAD DATA --" as "";
		--enable_query_log
		--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.000002 2> /dev/null

		# this should show almost nothing
		@@ -56,6 +57,7 @@ select "--- Broken LOAD DATA --" as "";
		select "--- --database --" as "";
		--enable_query_log
		--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/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001 2> /dev/null

		# this test for position option
		@@ -63,6 +65,7 @@ select "--- --database --" as "";
		select "--- --position --" as "";
		--enable_query_log
		--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/ --position=231 $MYSQLTEST_VARDIR/log/master-bin.000002

		# These are tests for remote binlog.
		@@ -74,6 +77,7 @@ select "--- Remote --" as "";

		# This is broken now
		--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/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001

		# This is broken too
		@@ -81,6 +85,7 @@ select "--- Remote --" as "";
		select "--- Broken LOAD DATA --" as "";
		--enable_query_log
		--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/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 2> /dev/null

		# And this too ! (altough it is documented)
		@@ -88,6 +93,7 @@ select "--- Broken LOAD DATA --" as "";
		select "--- --database --" as "";
		--enable_query_log
		--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/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 2> /dev/null

		# Strangely but this works
		@@ -95,6 +101,7 @@ select "--- --database --" as "";
		select "--- --position --" as "";
		--enable_query_log
		--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/ --read-from-remote-server --position=231 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002

		# Bug#7853 (mysqlbinlog does not accept input from stdin)
		@@ -102,9 +109,11 @@ select "--- --position --" as "";
		select "--- reading stdin --" as "";
		--enable_query_log
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
		--exec $MYSQL_BINLOG --short-form - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001

		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
		--exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
		drop table t1,t2;

		@@ -167,6 +176,7 @@ call p1();
		drop procedure p1;
		--error 1305
		call p1();
		--replace_regex /SQL_LOAD_MB-[0-9]-[0-9]/SQL_LOAD_MB-#-#/
		--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007
		--exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 \| $MYSQL
		call p1();
		@@ -202,6 +212,7 @@ select hex(a) from t1;
		drop table t1;
		flush logs;
		--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.000009

		#