database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-26 07:02:12 +03:00
Code Activity

MDEV-19914 Server startup fails while dropping garbage encrypted tablespace if innodb_encryption_threads > 0

Browse Source 
- Avoiding accessing encryption thread mutex before initiating
the encryption threads
This commit is contained in:
Thirunarayanan Balathandayuthapani
2019-07-01 15:21:17 +05:30
parent ed6da51f3e
commit 85d0a1955f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/encryption/t/innodb-encryption-alter.test
View File

@ -123,6 +123,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR done';
SET GLOBAL innodb_flush_log_at_trx_commit=1; SET GLOBAL innodb_flush_log_at_trx_commit=1;
COMMIT; COMMIT;
let $restart_parameters = --innodb_encryption_threads=2;
--let $shutdown_timeout= 0 --let $shutdown_timeout= 0
--source include/restart_mysqld.inc --source include/restart_mysqld.inc
disconnect con1; disconnect con1;

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

@ -2414,7 +2414,8 @@ fil_space_crypt_close_tablespace(
{ {
fil_space_crypt_t* crypt_data = space->crypt_data; 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; return;
} }