diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-18 22:29:53 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-03-18 22:29:53 +0100 |
| commit | f10dec68eed0c9ce90b20eff783154c89108a32a (patch) | |
| tree | 582f0db601903ddd89ad02a4b0fa02a0a6ea9ff6 /client | |
| parent | 691de48ddb9b14e423e64299448d4ee0d68e2714 (diff) | |
| parent | 2fb8854aa06da75f9a4d9b4a0bcafc3888ecea5c (diff) | |
| download | mariadb-git-f10dec68eed0c9ce90b20eff783154c89108a32a.tar.gz | |
upmerge 43588
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 72901f76324..d3d68eb79cf 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4941,7 +4941,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) { /* |