diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 18:11:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-16 18:11:37 +0200 |
| commit | acf46b7b36a794cd66033e61e064f16896cf7d22 (patch) | |
| tree | c648d7f39b367d7825ea7169cee7bf54d2be1f86 /extra | |
| parent | e97560eac0321d43e98033f00fb0bd4f008bc9e9 (diff) | |
| parent | a55b951e6082a4ce9a1f2ed5ee176ea7dbbaf1f2 (diff) | |
| download | mariadb-git-acf46b7b36a794cd66033e61e064f16896cf7d22.tar.gz | |
Merge 10.6 into 10.8
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 34b345a0dca..1d936b3d544 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2280,8 +2280,14 @@ static bool innodb_init() /* Check if the data files exist or not. */ dberr_t err= srv_sys_space.check_file_spec(&create_new_db, 5U << 20); + if (create_new_db) + { + msg("mariadb-backup: InnoDB files do not exist"); + return true; + } + if (err == DB_SUCCESS) - err= srv_start(create_new_db); + err= srv_start(false); if (err != DB_SUCCESS) { @@ -2292,6 +2298,7 @@ static bool innodb_init() ut_ad(srv_force_recovery <= SRV_FORCE_IGNORE_CORRUPT); ut_ad(recv_no_log_write); buf_flush_sync(); + recv_sys.debug_free(); DBUG_ASSERT(!buf_pool.any_io_pending()); log_sys.close_file(); @@ -3473,7 +3480,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( @@ -5279,7 +5288,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 { |