mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fixed slow bootstrap introduced in 10.6
The problem was that the signal thread was not killed when using unireg_abort(). The bug was introduced by: MDEV-30260: Slave crashed:reload_acl_and_cache during shutdown Other things fixed: - Don't produce memory leaks with safemalloc if all threads was not ended properly (not useful)
This commit is contained in:
@@ -220,7 +220,11 @@ void my_thread_global_end(void)
|
||||
fprintf(stderr,
|
||||
"Error in my_thread_global_end(): %d threads didn't exit\n",
|
||||
THR_thread_count);
|
||||
#endif
|
||||
#endif /* HAVE_PTHREAD_KILL */
|
||||
#ifdef SAFEMALLOC
|
||||
/* We know we will have memoryleaks, suppress the leak report */
|
||||
sf_leaking_memory= 1;
|
||||
#endif /* SAFEMALLOC */
|
||||
all_threads_killed= 0;
|
||||
break;
|
||||
}
|
||||
@@ -234,9 +238,7 @@ void my_thread_global_end(void)
|
||||
that could use them.
|
||||
*/
|
||||
if (all_threads_killed)
|
||||
{
|
||||
my_thread_destroy_internal_mutex();
|
||||
}
|
||||
my_thread_global_init_done= 0;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user