diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-07-27 13:34:37 +0200 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-07-27 13:34:37 +0200 |
| commit | 4fae3c56b6a9d26e53570fc2468291d92a3c2a5b (patch) | |
| tree | 4057805a880d550fea7a0e6f758b93e0de1855b9 /sql/threadpool_common.cc | |
| parent | 6898eae7f8ef3f0b773687c0308520f072da0bc9 (diff) | |
| download | mariadb-git-10.2-sysprg-MDEV-21910.tar.gz | |
MDEV-21910: merge reworked 10.4-MDEV-21910 patch into 10.210.2-sysprg-MDEV-21910
Diffstat (limited to 'sql/threadpool_common.cc')
| -rw-r--r-- | sql/threadpool_common.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index b0438770aae..bf8a1323ef4 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -477,11 +477,11 @@ void tp_timeout_handler(TP_connection *c) if (c->state != TP_STATE_IDLE) return; THD *thd=c->thd; - mysql_mutex_lock(&thd->LOCK_thd_data); + mysql_mutex_lock(&thd->LOCK_thd_kill); thd->set_killed(KILL_WAIT_TIMEOUT); c->priority= TP_PRIORITY_HIGH; post_kill_notification(thd); - mysql_mutex_unlock(&thd->LOCK_thd_data); + mysql_mutex_unlock(&thd->LOCK_thd_kill); } |