summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-09-19 17:03:17 +1000
committerDaniel Black <daniel@mariadb.org>2022-09-19 17:03:17 +1000
commit3c8674edcc99605aa4634145771b2195c3f4f007 (patch)
tree2841d7296cbbf893558f2a073342d87337889229 /extra
parent01d78d31ca42099bd43fb258a5f6da149b63f421 (diff)
parentef784c4ea2ce93bc8cdd953e84456e69f5875dda (diff)
downloadmariadb-git-3c8674edcc99605aa4634145771b2195c3f4f007.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'extra')
-rw-r--r--extra/mariabackup/xtrabackup.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index 2c4da11c860..03b8a1d3ea5 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -2364,7 +2364,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 == ULINT_UNDEFINED) {