summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2017-07-07 12:43:10 +0400
committerAlexander Barkov <bar@mariadb.org>2017-07-07 12:43:10 +0400
commit8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39 (patch)
tree72fa33f92344a89792845bab9225cef56b4138c4 /sql/sql_connect.cc
parent3f327432942ef5db14dd905ffd147f234dc74bfb (diff)
parent3b862aaa10942e7405b90cf80d0c3baca4cda55d (diff)
downloadmariadb-git-8b2c7c9444db2369d2ecdaa1f14fbc8826a8fb39.tar.gz
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index d8ac571b578..168814bcc81 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;