diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-03-08 11:30:20 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-03-08 11:30:20 -0300 |
commit | d58532247457b436e562aa8b49c75e4bfaaae8bf (patch) | |
tree | 3f2db42be249619b882e5355c4d40c634507e2b6 /client | |
parent | f502deac11a36bd070c551725bb0bbb29829e01f (diff) | |
download | mariadb-git-d58532247457b436e562aa8b49c75e4bfaaae8bf.tar.gz |
Bug#37316: Anonymous error messages noticed sometimes, while running tests in MTR
The problem was that mysqltest could attempt to execute a
SHOW WARNINGS statement through a connection that was not
properly reaped, thus violating its own rules.
The solution is to skip SHOW WARNINGS if a connection has
not been properly repeaed.
client/mysqltest.cc:
Skip SHOW WARNINGS if connection hasn't been reaped.
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 867b2747707..141440a91d8 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1256,7 +1256,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); |