summaryrefslogtreecommitdiff
path: root/sql/threadpool_unix.cc
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2015-12-04 18:16:04 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2015-12-04 18:16:04 +0100
commit50160216eab066de7a71dd8e355f0c5cb29c8789 (patch)
tree1fa9274cc7cbb63b6f275bbcc3c849828437e4f5 /sql/threadpool_unix.cc
parentba8e630d97af2b2ed3e527070f1cab05571911fd (diff)
downloadmariadb-git-50160216eab066de7a71dd8e355f0c5cb29c8789.tar.gz
MDEV-9156 : Fix tp_add_connection()'s error handling
Avoid possible my_thread_end() in the main polling thread.
Diffstat (limited to 'sql/threadpool_unix.cc')
-rw-r--r--sql/threadpool_unix.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc
index e720e43498a..89a2036cb10 100644
--- a/sql/threadpool_unix.cc
+++ b/sql/threadpool_unix.cc
@@ -1255,7 +1255,7 @@ void tp_add_connection(THD *thd)
else
{
/* Allocation failed */
- threadpool_remove_connection(thd);
+ threadpool_cleanup_connection(thd);
}
DBUG_VOID_RETURN;
}