From 7cf10ddf8ca7044278b4aa1cf5a5525675cd101d Mon Sep 17 00:00:00 2001 From: Seppo Jaakola Date: Mon, 5 Aug 2013 18:01:05 +0300 Subject: [PATCH] References lp:1208493 https://mariadb.atlassian.net/browse/MDEV-4830 Enabling slave applier thread to send COND_thread_count --- sql/sql_parse.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c8be6be541f..7fe8be00125 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -8431,13 +8431,11 @@ void wsrep_replication_process(THD *thd) break; } - if (thd->killed != KILL_CONNECTION) - { - mysql_mutex_lock(&LOCK_thread_count); - wsrep_close_applier(thd); - mysql_cond_broadcast(&COND_thread_count); - mysql_mutex_unlock(&LOCK_thread_count); - } + mysql_mutex_lock(&LOCK_thread_count); + wsrep_close_applier(thd); + mysql_cond_broadcast(&COND_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); + wsrep_return_from_bf_mode(thd, &shadow); DBUG_VOID_RETURN; }