From 2707f1356634affcb0ca6c3392cbea3cff0fef22 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 23 Feb 2006 10:57:33 +0100 Subject: [PATCH] After merge fix mysql-test/t/mysqltest.test: Fix merge --- mysql-test/t/mysqltest.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 2d24bd5a76c..f20cb31b10e 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -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