diff options
| author | Daniel Black <daniel@linux.vnet.ibm.com> | 2018-02-20 10:19:55 +1100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-02-21 18:07:43 +0100 |
| commit | 8f50a26eb7e45023cab941675b4285312036486b (patch) | |
| tree | 7ef47f4ce0167fb7dc3604c43c4f232282ef7a5b /sql/threadpool_common.cc | |
| parent | e2ac8d3ff1fb941090fe63d3dfc55562f34326f4 (diff) | |
| download | mariadb-git-8f50a26eb7e45023cab941675b4285312036486b.tar.gz | |
MDEV-15356: tp_timeout_handler needs to call set_killed_no_mutex as it has the mutex
Regression introducted in c2118a08b144 where LOCK_thd_data was moveed
to LOCK_thd_kill
Diffstat (limited to 'sql/threadpool_common.cc')
| -rw-r--r-- | sql/threadpool_common.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index e5ac4b49a2a..a0d1532e31a 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -470,7 +470,7 @@ void tp_timeout_handler(TP_connection *c) return; THD *thd=c->thd; mysql_mutex_lock(&thd->LOCK_thd_kill); - thd->set_killed(KILL_WAIT_TIMEOUT); + thd->set_killed_no_mutex(KILL_WAIT_TIMEOUT); c->priority= TP_PRIORITY_HIGH; post_kill_notification(thd); mysql_mutex_unlock(&thd->LOCK_thd_kill); |