diff options
| author | msvensson@neptunus.(none) <> | 2005-09-02 11:21:59 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-09-02 11:21:59 +0200 |
| commit | 375dc1531cf1801913727b5af553b1f7fce2ec7a (patch) | |
| tree | 804bcb6209bc3ec0787d035e9da321f4795e2e40 /mysql-test | |
| parent | 98a5362c1e2f3354a85db3a31f63a06ffef3943a (diff) | |
| parent | 78f32604ac9e7342beef1287d67af92e3a34c41b (diff) | |
| download | mariadb-git-375dc1531cf1801913727b5af553b1f7fce2ec7a.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 7 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 80c54f589da..9175bdc7250 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -179,9 +179,7 @@ source database echo message echo message mysqltest: At line 1: Empty variable -sh: -c: line 0: syntax error near unexpected token `;' -sh: -c: line 0: `;' -mysqltest: At line 1: command ";" failed +mysqltest: At line 1: command "';' 2> /dev/null" failed mysqltest: At line 1: Missing argument in exec MySQL "MySQL" @@ -303,8 +301,7 @@ mysqltest: At line 1: First argument to dec must be a variable (start with $) mysqltest: At line 1: End of line junk detected: "1000" mysqltest: At line 1: Missing arguments to system, nothing to do! mysqltest: At line 1: Missing arguments to system, nothing to do! -sh: NonExistsinfComamdn: command not found -mysqltest: At line 1: system command 'NonExistsinfComamdn' failed +mysqltest: At line 1: system command 'NonExistsinfComamdn 2> /dev/null' failed test test2 test3 diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index ee2104d19b0..bfb1919e75c 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -424,7 +424,7 @@ echo ; # Illegal use of exec --error 1 ---exec echo "--exec ;" | $MYSQL_TEST 2>&1 +--exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1 --error 1 --exec echo "--exec " | $MYSQL_TEST 2>&1 @@ -672,7 +672,7 @@ system echo "hej" > /dev/null; --error 1 --exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "system NonExistsinfComamdn;" | $MYSQL_TEST 2>&1 +--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $MYSQL_TEST 2>&1 --disable_abort_on_error system NonExistsinfComamdn; |