Skip to content
Permalink
Browse files

MDEV-19914 Server startup fails while dropping garbage encrypted tabl…

…espace if innodb_encryption_threads > 0

- Avoiding accessing encryption thread mutex before initiating
the encryption threads
  • Loading branch information...
Thirunarayanan committed Jul 1, 2019
1 parent ed6da51 commit 85d0a1955fe9b9cf87fb6cbfe84d684bff2b24cc
@@ -123,6 +123,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR done';
SET GLOBAL innodb_flush_log_at_trx_commit=1;
COMMIT;

let $restart_parameters = --innodb_encryption_threads=2;
--let $shutdown_timeout= 0
--source include/restart_mysqld.inc
disconnect con1;
@@ -2414,7 +2414,8 @@ fil_space_crypt_close_tablespace(
{
fil_space_crypt_t* crypt_data = space->crypt_data;

if (!crypt_data || srv_n_fil_crypt_threads == 0) {
if (!crypt_data || srv_n_fil_crypt_threads == 0
|| !fil_crypt_threads_inited) {
return;
}

0 comments on commit 85d0a19

Please sign in to comment.
You can’t perform that action at this time.