diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-28 16:35:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-28 16:35:20 +0200 |
| commit | beae2cf00689fa2b27fb48ddbd0c48ca58e81e2a (patch) | |
| tree | 98b82c42754d606e2869e81ac1dfb00d751b5981 /storage/innobase/include | |
| parent | bacdc4df6196d18a8a3f09ddddae0f0342f35a98 (diff) | |
| parent | 4beace33160d6f94556a3e30423db1dcd0ac72cf (diff) | |
| download | mariadb-git-beae2cf00689fa2b27fb48ddbd0c48ca58e81e2a.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/trx0sys.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h index c1d1cf29dfa..bdac5a86a0e 100644 --- a/storage/innobase/include/trx0sys.h +++ b/storage/innobase/include/trx0sys.h @@ -68,17 +68,13 @@ trx_sys_rseg_find_free(const buf_block_t* sys_header); @param[in] rw whether to lock the page for writing @return the TRX_SYS page @retval NULL if the page cannot be read */ -inline -buf_block_t* -trx_sysf_get(mtr_t* mtr, bool rw = true) +inline buf_block_t *trx_sysf_get(mtr_t* mtr, bool rw= true) { - buf_block_t* block = buf_page_get( - page_id_t(TRX_SYS_SPACE, TRX_SYS_PAGE_NO), - 0, rw ? RW_X_LATCH : RW_S_LATCH, mtr); - if (block) { - buf_block_dbg_add_level(block, SYNC_TRX_SYS_HEADER); - } - return block; + buf_block_t* block = buf_page_get(page_id_t(TRX_SYS_SPACE, TRX_SYS_PAGE_NO), + 0, rw ? RW_X_LATCH : RW_S_LATCH, mtr); + if (block) + buf_block_dbg_add_level(block, SYNC_TRX_SYS_HEADER); + return block; } #ifdef UNIV_DEBUG @@ -200,14 +196,13 @@ trx_sysf_rseg_get_space(const buf_block_t* sys_header, ulint rseg_id) @param[in] sys_header TRX_SYS page @param[in] rseg_id rollback segment identifier @return undo page number */ -inline -uint32_t -trx_sysf_rseg_get_page_no(const buf_block_t* sys_header, ulint rseg_id) +inline uint32_t +trx_sysf_rseg_get_page_no(const buf_block_t *sys_header, ulint rseg_id) { - ut_ad(rseg_id < TRX_SYS_N_RSEGS); - return mach_read_from_4(TRX_SYS + TRX_SYS_RSEGS + TRX_SYS_RSEG_PAGE_NO - + rseg_id * TRX_SYS_RSEG_SLOT_SIZE - + sys_header->frame); + ut_ad(rseg_id < TRX_SYS_N_RSEGS); + return mach_read_from_4(TRX_SYS + TRX_SYS_RSEGS + TRX_SYS_RSEG_PAGE_NO + + rseg_id * TRX_SYS_RSEG_SLOT_SIZE + + sys_header->frame); } /** Maximum length of MySQL binlog file name, in bytes. |