summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqltest.test
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-03-22 11:28:57 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2010-03-22 11:28:57 +0100
commit7f20e9fd060a5cc0f3c9c3e20f5167c0dab3bb5b (patch)
tree7ead65a9694b76434fc37afc0221ff02510fd4af /mysql-test/t/mysqltest.test
parent9d313a5e2483c00b53c4c96f315fa786b66a1ae7 (diff)
downloadmariadb-git-7f20e9fd060a5cc0f3c9c3e20f5167c0dab3bb5b.tar.gz
Bug #43603 mysqltest command disable_abort_on_error does not affect all built-in commands
After disable_abort_on_error, behaved as if --error was in effect Add condition before die, as after queries
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r--mysql-test/t/mysqltest.test9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 649a5fce366..09916f4f8cf 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -326,6 +326,15 @@ eval select $mysql_errno as "after_!errno_masked_error" ;
--exec echo "disable_abort_on_error; error 1000; select 3 from t1; error 1000; select 3 from t1;" | $MYSQL_TEST 2>&1
# ----------------------------------------------------------------------------
+# Check some non-query statements that would fail
+# ----------------------------------------------------------------------------
+--exec illegal_command
+--cat_file does_not_exist
+--perl
+ exit(1);
+EOF
+
+# ----------------------------------------------------------------------------
# Switch the abort on error on and check the effect on $mysql_errno
# ----------------------------------------------------------------------------
--error ER_PARSE_ERROR