diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-23 10:30:31 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-23 10:30:31 +0100 |
| commit | 897f8eabf5e1dba41d0e7cafdddb781ce1beecaa (patch) | |
| tree | 9146ec569bd9bf67b47d52e7e1ecdc29a1d5fb26 /mysql-test/t/mysqltest.test | |
| parent | f0cff0f64881798cdb3ae537baf3936ddf430073 (diff) | |
| parent | 44e286d215a8aab474c98c32a7c3896a581a0a10 (diff) | |
| download | mariadb-git-897f8eabf5e1dba41d0e7cafdddb781ce1beecaa.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/mysqltest.test:
Merge
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index edf9cf36d61..1bb1cd48f0d 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -691,7 +691,7 @@ echo $i; --error 1 --exec echo "inc i;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "let \\\$i=100; inc \\\$i 1000; echo \\\$i;" | $MYSQL_TEST 2>&1 +--exec echo "let \$i=100; inc \$i 1000; echo \$i;" | $MYSQL_TEST 2>&1 inc $i; inc $i; inc $i; --echo $i echo $i; @@ -719,7 +719,7 @@ echo $d; --error 1 --exec echo "dec i;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "let \\\$i=100; dec \\\$i 1000; echo \\\$i;" | $MYSQL_TEST 2>&1 +--exec echo "let \$i=100; dec \$i 1000; echo \$i;" | $MYSQL_TEST 2>&1 # ---------------------------------------------------------------------------- @@ -803,11 +803,11 @@ while (!$i) --error 1 --exec echo "source include/mysqltest_while.inc;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "while \\\$i;" | $MYSQL_TEST 2>&1 +--exec echo "while \$i;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "while (\\\$i;" | $MYSQL_TEST 2>&1 +--exec echo "while (\$i;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "let \\\$i=1; while (\\\$i) dec \\\$i;" | $MYSQL_TEST 2>&1 +--exec echo "let \$i=1; while (\$i) dec \$i;" | $MYSQL_TEST 2>&1 --error 1 --exec echo "};" | $MYSQL_TEST 2>&1 --error 1 @@ -919,22 +919,22 @@ select "a" as col1, "c" as col2; --exec echo "connect (con1,localhost,root,,,,,SMTP POP);" | $MYSQL_TEST 2>&1 # Repeat connect/disconnect ---exec echo "let \\\$i=100;" > $MYSQLTEST_VARDIR/tmp/con.sql ---exec echo "while (\\\$i)" >> $MYSQLTEST_VARDIR/tmp/con.sql +--exec echo "let \$i=100;" > $MYSQLTEST_VARDIR/tmp/con.sql +--exec echo "while (\$i)" >> $MYSQLTEST_VARDIR/tmp/con.sql --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 # Repeat connect/disconnect, exceed max number of connections ---exec echo "let \\\$i=200;" > $MYSQLTEST_VARDIR/tmp/con.sql ---exec echo "while (\\\$i)" >> $MYSQLTEST_VARDIR/tmp/con.sql +--exec echo "let \$i=200;" > $MYSQLTEST_VARDIR/tmp/con.sql +--exec echo "while (\$i)" >> $MYSQLTEST_VARDIR/tmp/con.sql --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 @@ -1052,7 +1052,7 @@ select "this will be executed"; # # Test that a test file that does not generate any output fails. # ---exec echo "let \\\$i= 1;" > $MYSQLTEST_VARDIR/tmp/query.sql +--exec echo "let \$i= 1;" > $MYSQLTEST_VARDIR/tmp/query.sql --error 1 --exec $MYSQL_TEST -x $MYSQLTEST_VARDIR/tmp/query.sql 2>&1 |