diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-08 09:41:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-08 09:41:06 +0200 |
| commit | 78d0d2cdc56634cd6212b5c6320a938d4dff42cc (patch) | |
| tree | 6579b79faaddd834ffca15f6a42f55c6cb416fef /extra | |
| parent | 8a5eb4141b2ca9b8cc4e6510f4eba8f5ff9eb7dd (diff) | |
| download | mariadb-git-78d0d2cdc56634cd6212b5c6320a938d4dff42cc.tar.gz | |
Cleanup: Remove mach_read_ulint()
The function mach_read_ulint() is a wrapper for the lower-level
functions mach_read_from_1(), mach_read_from_2(), mach_read_from_8().
Invoke those functions directly, for better readability of the code.
mtr_t::read_ulint(), mtr_read_ulint(): Remove. Yes, we will lose the
ability to assert that the read is covered by the mini-transaction.
We would still check that on writes, and any writes that
wrongly bypass mini-transaction logging would likely be caught by
stress testing with Mariabackup.
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 f695b5c7f6d..3ddd8786ee9 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -3343,9 +3343,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; |