diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
| commit | f6633bf058802ad7da8196d01fd19d75c53f7274 (patch) | |
| tree | b7ba9832aae2a3d0c72d2bf3d89cf2a5f13a44f6 /sql/sql_connect.cc | |
| parent | fc5932a1b733b331be20c3f1b45c61c798227dba (diff) | |
| parent | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (diff) | |
| download | mariadb-git-f6633bf058802ad7da8196d01fd19d75c53f7274.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 5cb4cd87296..35ec7fa74e1 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -1462,7 +1462,7 @@ THD *CONNECT::create_thd(THD *thd) res= my_net_init(&thd->net, vio, thd, MYF(MY_THREAD_SPECIFIC)); vio= 0; // Vio now handled by thd - if (res) + if (res || thd->is_error()) { if (!thd_reused) delete thd; |