mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
MDEV-17228 Encrypted temporary tables are not encrypted
- log_crypt_init() should be called from create_log_files(). Because it should re-create the new random nonce compared to the old ones.
This commit is contained in:
parent
5a136d84f3
commit
dca9792a24
1 changed files with 4 additions and 2 deletions
|
@ -491,6 +491,9 @@ create_log_files(
|
|||
|
||||
/* Create a log checkpoint. */
|
||||
log_mutex_enter();
|
||||
if (log_sys->is_encrypted() && !log_crypt_init()) {
|
||||
return DB_ERROR;
|
||||
}
|
||||
ut_d(recv_no_log_write = false);
|
||||
log_sys->lsn = ut_uint64_align_up(lsn, OS_FILE_LOG_BLOCK_SIZE);
|
||||
|
||||
|
@ -1920,8 +1923,7 @@ innobase_start_or_create_for_mysql()
|
|||
|
||||
srv_log_file_size_requested = srv_log_file_size;
|
||||
|
||||
if ((srv_encrypt_log || innodb_encrypt_temporary_tables)
|
||||
&& !log_crypt_init()) {
|
||||
if (innodb_encrypt_temporary_tables && !log_crypt_init()) {
|
||||
return srv_init_abort(DB_ERROR);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue