diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 15:48:08 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 15:48:08 +0200 |
| commit | 85cbfaefee694cdd490b357444f24ff16b8042e8 (patch) | |
| tree | 11f7a96caf686598c6155cc5e2a098617cf077cb /extra | |
| parent | f169dfb41adcb637732507ed56d3038003170a15 (diff) | |
| parent | 1495f057c8a3aa5783de0993f6f95aae3e352f7a (diff) | |
| download | mariadb-git-85cbfaefee694cdd490b357444f24ff16b8042e8.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 4d2a96d8a21..85999ffd0ef 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3445,7 +3445,9 @@ static void xb_load_single_table_tablespace(const char *dirname, if (err == DB_SUCCESS && file->space_id() != SRV_TMP_SPACE_ID) { space = fil_space_t::create( file->space_id(), file->flags(), - FIL_TYPE_TABLESPACE, NULL/* TODO: crypt_data */); + FIL_TYPE_TABLESPACE, nullptr/* TODO: crypt_data */, + FIL_ENCRYPTION_DEFAULT, + file->handle() != OS_FILE_CLOSED); ut_a(space != NULL); fil_node_t* node= space->add( @@ -5312,7 +5314,8 @@ exit: ut_ad(fil_space_t::physical_size(flags) == info.page_size); if (fil_space_t::create(info.space_id, flags, - FIL_TYPE_TABLESPACE, 0)) { + FIL_TYPE_TABLESPACE, 0, FIL_ENCRYPTION_DEFAULT, + true)) { *success = xb_space_create_file(real_name, info.space_id, flags, &file); } else { |