diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-09 22:06:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-10 08:15:25 +0200 |
| commit | a20340cf859ba1b10174d4b8ee002d1548bf102c (patch) | |
| tree | e0be26cad1a7a2a75c03f128312362feb9f83a95 /storage/innobase/include/trx0undo.ic | |
| parent | 0ef91c89582fd9cacf0f7b2801351de4772ef374 (diff) | |
| download | mariadb-git-a20340cf859ba1b10174d4b8ee002d1548bf102c.tar.gz | |
Hard-code innodb_page_size as the undo log page size.
InnoDB undo logs currently always use the innodb_page_size,
whether they are stored in the system tablespace, in a
dedicated undo tablespace, or in the temporary tablespace.
Remove redundant page_size parameters.
TrxUndoRsegsIterator::set_next(): return bool instead of page_size.
Diffstat (limited to 'storage/innobase/include/trx0undo.ic')
| -rw-r--r-- | storage/innobase/include/trx0undo.ic | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/storage/innobase/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic index 62d9e64b13f..a0790022d7f 100644 --- a/storage/innobase/include/trx0undo.ic +++ b/storage/innobase/include/trx0undo.ic @@ -1,6 +1,7 @@ /***************************************************************************** Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2017, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -153,17 +154,13 @@ trx_read_roll_ptr( /** Gets an undo log page and x-latches it. @param[in] page_id page id -@param[in] page_size page size @param[in,out] mtr mini-transaction @return pointer to page x-latched */ UNIV_INLINE page_t* -trx_undo_page_get( - const page_id_t& page_id, - const page_size_t& page_size, - mtr_t* mtr) +trx_undo_page_get(const page_id_t& page_id, mtr_t* mtr) { - buf_block_t* block = buf_page_get(page_id, page_size, + buf_block_t* block = buf_page_get(page_id, univ_page_size, RW_X_LATCH, mtr); buf_block_dbg_add_level(block, SYNC_TRX_UNDO_PAGE); @@ -173,17 +170,13 @@ trx_undo_page_get( /** Gets an undo log page and s-latches it. @param[in] page_id page id -@param[in] page_size page size @param[in,out] mtr mini-transaction @return pointer to page s-latched */ UNIV_INLINE page_t* -trx_undo_page_get_s_latched( - const page_id_t& page_id, - const page_size_t& page_size, - mtr_t* mtr) +trx_undo_page_get_s_latched(const page_id_t& page_id, mtr_t* mtr) { - buf_block_t* block = buf_page_get(page_id, page_size, + buf_block_t* block = buf_page_get(page_id, univ_page_size, RW_S_LATCH, mtr); buf_block_dbg_add_level(block, SYNC_TRX_UNDO_PAGE); |