diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-08 09:43:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-08 09:43:41 +0200 |
| commit | 52246dff2c76b0ba79993276c5853aae51ecb9b7 (patch) | |
| tree | 67e15ba7edc2d7d0dd170e8ade2a592bd7521bda /extra | |
| parent | db5654399371a2672f84771c2cc1ae928bf1a48e (diff) | |
| parent | 78d0d2cdc56634cd6212b5c6320a938d4dff42cc (diff) | |
| download | mariadb-git-52246dff2c76b0ba79993276c5853aae51ecb9b7.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 0046d62d25e..1c71deb4594 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3329,9 +3329,9 @@ retry: + TRX_SYS_RSEG_PAGE_NO + page) != FIL_NULL); - space = mach_read_ulint(TRX_SYS + TRX_SYS_RSEGS - + TRX_SYS_RSEG_SLOT_SIZE - + TRX_SYS_RSEG_SPACE + page, MLOG_4BYTES); + space = mach_read_from_4(TRX_SYS + TRX_SYS_RSEGS + + TRX_SYS_RSEG_SLOT_SIZE + + TRX_SYS_RSEG_SPACE + page); srv_undo_space_id_start = space; |