From 49b25020ef512866751f192b91d8439670d0430b Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Fri, 9 Sep 2016 18:09:59 +0200 Subject: [PATCH] Fix assertion/hang in read_init_file() If there are other threads running (for example binlog background thread), then the thread count may not drop to zero at the end of do_handle_bootstrap(). This caused an assertion and missing wakeup of the main thread. The missing wakeup is because THD::~THD() only signals the COND_thread_count mutex when the number of threads drops to zero. Signed-off-by: Kristian Nielsen --- sql/sql_parse.cc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 72630822ad4..6baff31537a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1082,9 +1082,20 @@ void do_handle_bootstrap(THD *thd) end: in_bootstrap= FALSE; delete thd; + if (!opt_bootstrap) + { + /* + We need to wake up main thread in case of read_init_file(). + This is not done by THD::~THD() when there are other threads running + (binlog background thread, for example). So do it here again. + */ + mysql_mutex_lock(&LOCK_thread_count); + mysql_cond_broadcast(&COND_thread_count); + mysql_mutex_unlock(&LOCK_thread_count); + } #ifndef EMBEDDED_LIBRARY - DBUG_ASSERT(thread_count == 0); + DBUG_ASSERT(!opt_bootstrap || thread_count == 0); my_thread_end(); pthread_exit(0); #endif