After merge fix

mysql-test/t/mysqltest.test: Fix merge

After merge fix
mysql-test/t/mysqltest.test: Fix merge
2707f135 · unknown · 97bc9275 · 2707f135
Commit 2707f135 authored Feb 23, 2006 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/t/mysqltest.test mysql-test/t/mysqltest.test +2 -2

No files found.
--- 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