mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge from 5.1 up to rev 3392

Browse source
This commit is contained in:
Bjorn Munch 2010-06-02 16:23:29 +02:00
commit d5f2972628
1523 changed files with 954338 additions and 10066 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/mysqltest.cc
View file

@ -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);