diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-07 17:43:26 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-07 17:43:26 +0000 |
| commit | da05d0276a0569341c8bb41365dc7b05f9c4ddb7 (patch) | |
| tree | eb8c9ffc705ca3d5a6589dc64cefe8b5470e4501 /extra | |
| parent | ea4e8bab327806bdfcaa8e92dd2d1436476a8cef (diff) | |
| parent | 01e656a68514d45269162538f54e5c91dfecb581 (diff) | |
| download | mariadb-git-da05d0276a0569341c8bb41365dc7b05f9c4ddb7.tar.gz | |
merge 10.1->10.2
Some innobase/xtrabackup changes around from 10.1 are null merged
, in partucular using os_set_file_size to extend tablespaces in server
or mariabackup.
They require non-trivial amount of additional work in 10.2, due to
innobase differences between 10.1 and 10.2
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/write_filt.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/mariabackup/write_filt.cc b/extra/mariabackup/write_filt.cc index a0633818405..76b66fa9953 100644 --- a/extra/mariabackup/write_filt.cc +++ b/extra/mariabackup/write_filt.cc @@ -79,7 +79,7 @@ wf_incremental_init(xb_write_filt_ctxt_t *ctxt, char *dst_name, cp->delta_buf_base = static_cast<byte *>(malloc(buf_size)); memset(cp->delta_buf_base, 0, buf_size); cp->delta_buf = static_cast<byte *> - (ut_align(cp->delta_buf_base, UNIV_PAGE_SIZE_MAX)); + (ut_align(cp->delta_buf_base, cursor->page_size.physical())); /* write delta meta info */ snprintf(meta_name, sizeof(meta_name), "%s%s", dst_name, |