diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 16:36:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 16:52:12 +0300 |
| commit | 18934fb58309f4491b34273b2781cce68f6d6e22 (patch) | |
| tree | e9e43e81979561fd5aec9d17dddd5cb6ea02e93f /client | |
| parent | 8a42ad7a5d3168b7ce92a38652d77424336a32b8 (diff) | |
| parent | 6aa50bad3947a0eab24fb029cd58f5945439e365 (diff) | |
| download | mariadb-git-18934fb58309f4491b34273b2781cce68f6d6e22.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index a05305a85e3..b962813f558 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -948,6 +948,8 @@ pthread_handler_t connection_thread(void *arg) end_thread: cn->query_done= 1; + mysql_close(cn->mysql); + cn->mysql= 0; mysql_thread_end(); pthread_exit(0); return 0; |