1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-8738 Application Verifier stop during server shutdown

Browse Source 
The verifier exception is caused by using thread local storage key
after key was deleted.

my_free() used current_thd within malloc size callback, which does
pthread_get_specific(THR_THD), but THR_THD is already deleted at this
point.

The fix moves pthread_key_delete() to a later point in shutdown.
This commit is contained in:
Vladislav Vaintroub 2015-11-04 13:17:40 +01:00
parent 95289e5b66
commit 1216429cfd
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sql/mysqld.cc
View File

@ -2046,6 +2046,16 @@ extern "C" void unireg_abort(int exit_code)
mysqld_exit(exit_code); mysqld_exit(exit_code);
} }
static void cleanup_tls()
{
if (THR_THD)
(void)pthread_key_delete(THR_THD);
if (THR_MALLOC)
(void)pthread_key_delete(THR_MALLOC);
}
static void mysqld_exit(int exit_code) static void mysqld_exit(int exit_code)
{ {
DBUG_ENTER("mysqld_exit"); DBUG_ENTER("mysqld_exit");
@ -2064,6 +2074,7 @@ static void mysqld_exit(int exit_code)
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
shutdown_performance_schema(); // we do it as late as possible shutdown_performance_schema(); // we do it as late as possible
#endif #endif
cleanup_tls();
DBUG_LEAVE; DBUG_LEAVE;
sd_notify(0, "STATUS=MariaDB server is down"); sd_notify(0, "STATUS=MariaDB server is down");
exit(exit_code); /* purecov: inspected */ exit(exit_code); /* purecov: inspected */
@ -2186,12 +2197,6 @@ void clean_up(bool print_message)
#endif #endif
free_list(opt_plugin_load_list_ptr); free_list(opt_plugin_load_list_ptr);
if (THR_THD)
(void) pthread_key_delete(THR_THD);
if (THR_MALLOC)
(void) pthread_key_delete(THR_MALLOC);
/* /*
The following lines may never be executed as the main thread may have The following lines may never be executed as the main thread may have
killed us killed us