References https://mariadb.atlassian.net/browse/MDEV-4185 - thread terminate was blocked for non-wsrep threads

This commit is contained in:
Seppo Jaakola 2013-02-21 10:16:47 +02:00
parent 7144f7f2d1
commit 91cd73104f

View file

@ -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)
{