After merge fix (2707f135) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/t/mysqltest.test

+2 −2

Original line number	Diff line number	Diff line
		@@ -923,7 +923,7 @@ select "a" as col1, "c" as col2;
		--exec echo "{" >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " connect (test_con1,localhost,root,,); " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " disconnect test_con1; " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " dec \\\$i; " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " dec \$i; " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo "}" >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo "source $MYSQLTEST_VARDIR/tmp/con.sql; echo OK;" \| $MYSQL_TEST 2>&1

		@@ -933,7 +933,7 @@ select "a" as col1, "c" as col2;
		--exec echo "{" >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " connect (test_con1,localhost,root,,); " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " disconnect test_con1; " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " dec \\\$i; " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo " dec \$i; " >> $MYSQLTEST_VARDIR/tmp/con.sql
		--exec echo "}" >> $MYSQLTEST_VARDIR/tmp/con.sql
		--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
		--error 1