summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-10-19 13:34:09 +0200
committermsvensson@neptunus.(none) <>2006-10-19 13:34:09 +0200
commit9a5b4a115100086815267c51ba12998b9e5e7d19 (patch)
tree9d934ad80fdf9957b7cf4b19b3593ac251983d0f /mysql-test
parentf59ac964f41eb2269c9047587fd8061a0d117960 (diff)
downloadmariadb-git-9a5b4a115100086815267c51ba12998b9e5e7d19.tar.gz
Add command "exit" to mysqltest, it will stop processing any more
commands and go directly to result file processing
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysqltest.result2
-rw-r--r--mysql-test/t/mysqltest.test14
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index ed7267fb71d..a63863977b0 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -518,4 +518,6 @@ hello
mysqltest: At line 1: Max delimiter length(16) exceeded
hello
hello
+mysqltest: At line 1: test of die
+Some output
End of tests
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index d98375ca746..3c20b38722f 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1548,5 +1548,19 @@ perl;
print "hello\n";
EOF
+# ----------------------------------------------------------------------------
+# test for die
+# ----------------------------------------------------------------------------
+
+--error 1
+--exec echo "die test of die;" | $MYSQL_TEST 2>&1
+
+
+# ----------------------------------------------------------------------------
+# test for exit
+# ----------------------------------------------------------------------------
+
+--exec echo "echo Some output; exit; echo Not this;" | $MYSQL_TEST 2>&1
+
--echo End of tests