database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix assertion/hang in read_init_file()

Browse Source 
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 <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2016-09-09 18:09:59 +02:00
parent be2b833c42
commit 49b25020ef
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_parse.cc
View File

@@ -1082,9 +1082,20 @@ void do_handle_bootstrap(THD *thd)
end: end:
in_bootstrap= FALSE; in_bootstrap= FALSE;
delete thd; 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 #ifndef EMBEDDED_LIBRARY
DBUG_ASSERT(thread_count == 0); DBUG_ASSERT(!opt_bootstrap || thread_count == 0);
my_thread_end(); my_thread_end();
pthread_exit(0); pthread_exit(0);
#endif #endif