diff options
author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-22 11:28:57 +0100 |
---|---|---|
committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-22 11:28:57 +0100 |
commit | 7f20e9fd060a5cc0f3c9c3e20f5167c0dab3bb5b (patch) | |
tree | 7ead65a9694b76434fc37afc0221ff02510fd4af /mysql-test/r | |
parent | 9d313a5e2483c00b53c4c96f315fa786b66a1ae7 (diff) | |
download | mariadb-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/r')
-rw-r--r-- | mysql-test/r/mysqltest.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index de7a3eefb6a..84412d2f387 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -572,7 +572,7 @@ if things work as expected Some data for cat_file command of mysqltest -mysqltest: At line 1: Failed to open file 'non_existing_file' +mysqltest: At line 1: command "cat_file" failed with error 1 mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists' mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file' mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file' |