diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-02 16:23:29 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-02 16:23:29 +0200 |
| commit | d5f2972628d90595c203bd82ec5def2d3d0a82da (patch) | |
| tree | 836f4fb2607334b84c5dce95ab313b9544911659 /client/mysqltest.cc | |
| parent | d5e9a45efdc0edd1ce5bb9741b0c1750e3a23b43 (diff) | |
| parent | 37b02cd7d99278aec20e793c79ed105e99b2f7e7 (diff) | |
| download | mariadb-git-d5f2972628d90595c203bd82ec5def2d3d0a82da.tar.gz | |
Merge from 5.1 up to rev 3392
Diffstat (limited to 'client/mysqltest.cc')
| -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 878de31d4ed..217428f7db3 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1262,7 +1262,7 @@ void die(const char *fmt, ...) Help debugging by displaying any warnings that might have been produced prior to the error */ - if (cur_con) + if (cur_con && !cur_con->pending) show_warnings_before_error(&cur_con->mysql); cleanup_and_exit(1); |