summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-14 11:39:30 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-14 11:39:30 +0300
commit3e3cfa893481abe9524a1657c4246fa9f91d4826 (patch)
treec4cf2861460ca15e3c9edd7ecc537636b4a43fee /extra
parent289105e282fb5f7865bb7ddb6226149ac5bdf2b8 (diff)
downloadmariadb-git-3e3cfa893481abe9524a1657c4246fa9f91d4826.tar.gz
MDEV-18589 Assertion on info.page_size failed in xb_delta_open_matching_space
xb_read_delta_metadata(): For ROW_FORMAT=COMPRESSED tables, initialize the info.zip_size with the physical page size and let info.page_size remain the logical page size, like xb_delta_open_matching_space() expects it to be ever since commit 0a1c3477bf359c55be3e11ec6502bc7b5bb87f29 (MDEV-18493).
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 fa3bb2c0279..a270a3edd04 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -2411,7 +2411,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) {