diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-12 12:51:53 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-12 12:51:53 +0300 |
| commit | dbbdc4b19691711c82e42c4def5f5325759524c4 (patch) | |
| tree | 1d8062b6d5a8ab72361ee3021277a00ca8c6acf1 /client/mysqltest.cc | |
| parent | 6e7b8b6a7ab2b58016403304b1c49cf908a6479d (diff) | |
| parent | b182c9bd2030c3b3c548157d1bc4c01c306b2c5c (diff) | |
| download | mariadb-git-dbbdc4b19691711c82e42c4def5f5325759524c4.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am
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 d19f03af5f2..628bfda1e29 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1245,7 +1245,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); |