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

Post-fix for MDEV-11688 fil_crypt_threads_end() tries to create threads

Browse Source 
fil_crypt_threads_cleanup(): Do nothing if nothing was initialized.
This commit is contained in:
Marko Mäkelä
2017-01-03 15:44:44 +02:00
parent fc779252ae
commit ba8198a34c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/fil/fil0crypt.cc
View File

@@ -2477,6 +2477,9 @@ void
fil_crypt_threads_cleanup() fil_crypt_threads_cleanup()
/*=======================*/ /*=======================*/
{ {
if (!fil_crypt_threads_inited) {
return;
}
os_event_free(fil_crypt_event); os_event_free(fil_crypt_event);
os_event_free(fil_crypt_threads_event); os_event_free(fil_crypt_threads_event);
mutex_free(&fil_crypt_threads_mutex); mutex_free(&fil_crypt_threads_mutex);

8
storage/xtradb/fil/fil0crypt.cc
View File

@@ -2465,8 +2465,9 @@ void
fil_crypt_threads_end() fil_crypt_threads_end()
/*===================*/ /*===================*/
{ {
/* stop threads */ if (fil_crypt_threads_inited) {
fil_crypt_set_thread_cnt(0); fil_crypt_set_thread_cnt(0);
}
} }
/********************************************************************* /*********************************************************************
@@ -2476,6 +2477,9 @@ void
fil_crypt_threads_cleanup() fil_crypt_threads_cleanup()
/*=======================*/ /*=======================*/
{ {
if (!fil_crypt_threads_inited) {
return;
}
os_event_free(fil_crypt_event); os_event_free(fil_crypt_event);
os_event_free(fil_crypt_threads_event); os_event_free(fil_crypt_threads_event);
mutex_free(&fil_crypt_threads_mutex); mutex_free(&fil_crypt_threads_mutex);