Commit 91cd7310 authored by Seppo Jaakola's avatar Seppo Jaakola

References https://mariadb.atlassian.net/browse/MDEV-4185 - thread terminate...

References https://mariadb.atlassian.net/browse/MDEV-4185 - thread terminate was blocked for non-wsrep threads
parent 7144f7f2
...@@ -1840,9 +1840,9 @@ void THD::awake(killed_state state_to_set) ...@@ -1840,9 +1840,9 @@ void THD::awake(killed_state state_to_set)
if (state_to_set != NOT_KILLED) if (state_to_set != NOT_KILLED)
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (!wsrep_bf_thd || wsrep_bf_thd->wsrep_exec_mode == LOCAL_STATE) if (!wsrep_bf_thd || wsrep_bf_thd->wsrep_exec_mode == LOCAL_STATE)
#else
ha_kill_query(this, thd_kill_level(this));
#endif /* WITH_WSREP */ #endif /* WITH_WSREP */
ha_kill_query(this, thd_kill_level(this));
/* Broadcast a condition to kick the target if it is waiting on it. */ /* Broadcast a condition to kick the target if it is waiting on it. */
if (mysys_var) if (mysys_var)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment