summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-03-17 15:25:55 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2010-03-17 15:25:55 +0100
commit2fb8854aa06da75f9a4d9b4a0bcafc3888ecea5c (patch)
treebd6084f3b7b22a53592413dfa611d986b5f37bed /client
parentbd20de0136bb222ab19e9a46ce3da971e9ddc19c (diff)
downloadmariadb-git-2fb8854aa06da75f9a4d9b4a0bcafc3888ecea5c.tar.gz
Bug #43588 mysqltest command disable_abort_on_error logs connect commands
Only log connects after --error A few small test adjustments needed/possible
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 64cf06736a0..18af4088e68 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -4920,7 +4920,7 @@ int connect_n_handle_errors(struct st_command *command,
ds= &ds_res;
/* Only log if an error is expected */
- if (!command->abort_on_error &&
+ if (command->expected_errors.count > 0 &&
!disable_query_log)
{
/*