Add correct replace (407389ba) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/mysqlbinlog.result

+7 −7

Original line number	Diff line number	Diff line
		@@ -289,23 +289,23 @@ SET @@session.sql_mode=0/!/;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/!/;
		create table t1 (a varchar(64) character set utf8)/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-6-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-6-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=7/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-7-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-7-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=DEFAULT/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-8-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-8-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-9-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-9-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=7/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-a-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=DEFAULT/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-b-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/!/;
		SET TIMESTAMP=1000000000/!/;
		drop table t1/!/;
		DELIMITER ;

mysql-test/t/mysqlbinlog.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ load data infile '../std_data_ln/loaddata6.dat' into table t1 character set koi8
		select hex(a) from t1;
		drop table t1;
		flush logs;
		--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
		--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
		--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000009

		--echo End of 5.0 tests

Original line number	Diff line number	Diff line
		@@ -289,23 +289,23 @@ SET @@session.sql_mode=0/!/;
		SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/!/;
		create table t1 (a varchar(64) character set utf8)/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-6-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-6-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=7/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-7-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-7-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=DEFAULT/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-8-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-8-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-9-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-9-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=7/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-a-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		SET @@session.collation_database=DEFAULT/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-b-0' INTO table t1/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO table t1/!/;
		SET TIMESTAMP=1000000000/!/;
		load data LOCAL INFILE 'MYSQL_TMP_DIR/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/!/;
		load data LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO table t1 character set koi8r/!/;
		SET TIMESTAMP=1000000000/!/;
		drop table t1/!/;
		DELIMITER ;