mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
References https://mariadb.atlassian.net/browse/MDEV-4185 - thread terminate was blocked for non-wsrep threads
This commit is contained in:
parent
7144f7f2d1
commit
91cd73104f
1 changed files with 2 additions and 2 deletions
|
@ -1840,9 +1840,9 @@ void THD::awake(killed_state state_to_set)
|
|||
if (state_to_set != NOT_KILLED)
|
||||
#ifdef WITH_WSREP
|
||||
if (!wsrep_bf_thd || wsrep_bf_thd->wsrep_exec_mode == LOCAL_STATE)
|
||||
#else
|
||||
ha_kill_query(this, thd_kill_level(this));
|
||||
#endif /* WITH_WSREP */
|
||||
ha_kill_query(this, thd_kill_level(this));
|
||||
|
||||
/* Broadcast a condition to kick the target if it is waiting on it. */
|
||||
if (mysys_var)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue