diff options
| author | Vlad Lesin <vlad_lesin@mail.ru> | 2021-01-18 12:48:37 +0300 |
|---|---|---|
| committer | Vlad Lesin <vlad_lesin@mail.ru> | 2021-01-18 12:48:37 +0300 |
| commit | c42821b9fc4485b63e22c1b8901f522533d92579 (patch) | |
| tree | bb6d0c145994fc0f0a0c1d949fb58c8e7c05a66c | |
| parent | beaea31ab12ab56ea8a6eb5e99cf82648675ea78 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-24612.tar.gz | |
MDEV-24612 innodb hangs if it's initialization is broken before encryption threads are startedbb-10.2-MDEV-24612
Do not init encryption threads if shutdown is in progress.
There is no test case for it yet.
| -rw-r--r-- | storage/innobase/fil/fil0crypt.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/innobase/fil/fil0crypt.cc b/storage/innobase/fil/fil0crypt.cc index 68a8a9be261..b3e4338da4a 100644 --- a/storage/innobase/fil/fil0crypt.cc +++ b/storage/innobase/fil/fil0crypt.cc @@ -2300,6 +2300,8 @@ fil_crypt_set_thread_cnt( const uint new_cnt) { if (!fil_crypt_threads_inited) { + if (srv_shutdown_state != SRV_SHUTDOWN_NONE) + return; fil_crypt_threads_init(); } |