diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
| commit | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch) | |
| tree | 652c6fd4576bab721661075f3ef1f3962251c8c9 /extra/mariabackup | |
| parent | b73c70c265cab9bae2fd5c243b484172bec0a91d (diff) | |
| parent | 789f55c947a8aa224e5b0a71d5c0bea375320091 (diff) | |
| download | mariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'extra/mariabackup')
| -rw-r--r-- | extra/mariabackup/changed_page_bitmap.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/extra/mariabackup/changed_page_bitmap.cc b/extra/mariabackup/changed_page_bitmap.cc index ac67bb9b924..793d7378b0f 100644 --- a/extra/mariabackup/changed_page_bitmap.cc +++ b/extra/mariabackup/changed_page_bitmap.cc @@ -455,7 +455,7 @@ log_online_open_bitmap_file_read_only( bitmap_file->size = os_file_get_size(bitmap_file->file); bitmap_file->offset = 0; -#ifdef UNIV_LINUX +#ifdef __linux__ posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_SEQUENTIAL); posix_fadvise(bitmap_file->file, 0, 0, POSIX_FADV_NOREUSE); #endif diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 5346072565d..ed68a96004d 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -2424,7 +2424,8 @@ xb_read_delta_metadata(const char *filepath, xb_delta_info_t *info) msg("page_size is required in %s", filepath); r = FALSE; } else { - info->page_size = zip_size ? zip_size : page_size; + info->page_size = page_size; + info->zip_size = zip_size; } if (info->space_id == UINT32_MAX) { |