From 05d68d87c958a35f951107dcb04304d9ade7563c Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sun, 27 Jan 2019 20:28:06 +0100 Subject: fixup! Removed redundant service_thread_count --- sql/wsrep_mysqld.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 24fbf96b261..1ddc1887ceb 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -2312,13 +2312,15 @@ void wsrep_close_client_connections(my_bool wait_to_end, THD* except_caller_thd) */ server_threads.iterate(kill_remaining_threads, except_caller_thd); - DBUG_PRINT("quit",("Waiting for threads to die (count=%u)",thread_count)); - WSREP_DEBUG("waiting for client connections to close: %u", thread_count); + DBUG_PRINT("quit", ("Waiting for threads to die (count=%u)", + uint32_t(thread_count))); + WSREP_DEBUG("waiting for client connections to close: %u", + uint32_t(thread_count)); while (wait_to_end && server_threads.iterate(have_client_connections)) { mysql_cond_wait(&COND_thread_count, &LOCK_thread_count); - DBUG_PRINT("quit",("One thread died (count=%u)", thread_count)); + DBUG_PRINT("quit",("One thread died (count=%u)", uint32_t(thread_count))); } kill_cached_threads= kill_cached_threads_saved; @@ -2372,7 +2374,7 @@ void wsrep_wait_appliers_close(THD *thd) } else mysql_cond_wait(&COND_thread_count,&LOCK_thread_count); - DBUG_PRINT("quit",("One applier died (count=%u)",thread_count)); + DBUG_PRINT("quit",("One applier died (count=%u)", uint32_t(thread_count))); } mysql_mutex_unlock(&LOCK_thread_count); /* Now kill remaining wsrep threads: rollbacker */ @@ -2389,7 +2391,7 @@ void wsrep_wait_appliers_close(THD *thd) } else mysql_cond_wait(&COND_thread_count,&LOCK_thread_count); - DBUG_PRINT("quit",("One thread died (count=%u)",thread_count)); + DBUG_PRINT("quit",("One thread died (count=%u)", uint32_t(thread_count))); } mysql_mutex_unlock(&LOCK_thread_count); -- cgit v1.2.1