summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqltest.test
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2005-09-07 16:39:16 +0200
committerunknown <msvensson@neptunus.(none)>2005-09-07 16:39:16 +0200
commit8b6a8cc5615f4df62e70ff54e8a90498a8a393a5 (patch)
treebf1b071e56c5e8b7d566471874524313dec7ebb9 /mysql-test/t/mysqltest.test
parent745181ce2023908df3657e7514e0681b7c0857b5 (diff)
downloadmariadb-git-8b6a8cc5615f4df62e70ff54e8a90498a8a393a5.tar.gz
BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn"
- Improved solution mysql-test/r/mysqltest.result: Update test results mysql-test/t/mysqltest.test: Fix test for failing "exec" and "system", by using the false command
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r--mysql-test/t/mysqltest.test10
1 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 4d3bcc037d1..fc9f621f7cd 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -426,9 +426,8 @@ echo ;
# ----------------------------------------------------------------------------
# Illegal use of exec
-# Disabled, some shells prints the failed command regardless of pipes
-#--error 1
-#--exec echo "--exec ';' 2> /dev/null" | $MYSQL_TEST 2>&1
+--error 1
+--exec echo "--exec false" | $MYSQL_TEST 2>&1
--error 1
--exec echo "--exec " | $MYSQL_TEST 2>&1
@@ -675,9 +674,8 @@ system echo "hej" > /dev/null;
--exec echo "system;" | $MYSQL_TEST 2>&1
--error 1
--exec echo "system $NONEXISTSINFVAREABLI;" | $MYSQL_TEST 2>&1
-# Disabled, some shells prints the failed command regardless of pipes
-#--error 1
-#--exec echo "system NonExistsinfComamdn 2> /dev/null;" | $MYSQL_TEST 2>&1
+--error 1
+--exec echo "system false;" | $MYSQL_TEST 2>&1
--disable_abort_on_error
system NonExistsinfComamdn;