summaryrefslogtreecommitdiff
path: root/storage/innobase/page/page0cur.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-01 17:56:50 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-01 18:00:02 +0300
commitb212f1dac284cc9b7a060f1eed2cd4604c326966 (patch)
tree447f1cc628ebb5e661384bcfd5c8f74e6aeaed52 /storage/innobase/page/page0cur.cc
parent587f3e0d9fa11005e217f32376a0a9dbd5a28616 (diff)
downloadmariadb-git-b212f1dac284cc9b7a060f1eed2cd4604c326966.tar.gz
MDEV-22107 Restore accidentally orphaned MTR_MEMO_MODIFY
In MDEV-12353, the calls to mtr_t::memo_modify_page() were accidentally removed along with mlog_open_and_write_index() and its callers. Let us resurrect the function to enable better debug checks. mtr_t::flag_modified(): Renamed from mtr_t::set_modified() and made private. mtr_t::set_modified(): Take const buf_block_t& as a parameter. In several mtr_t member functions, replace const buf_page_t& parameters with const buf_block_t&, so that we can pass the parameter to set_modified(). mtr_t::modify(): Add a MTR_MEMO_MODIFY entry for a block that is guaranteed to be modified in the mini-transaction.
Diffstat (limited to 'storage/innobase/page/page0cur.cc')
-rw-r--r--storage/innobase/page/page0cur.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc
index 060abe3e13d..1f59da16410 100644
--- a/storage/innobase/page/page0cur.cc
+++ b/storage/innobase/page/page0cur.cc
@@ -1104,7 +1104,7 @@ inline void mtr_t::page_insert(const buf_block_t &block, bool reuse,
ut_ad((n_fields_s >> 1) <= REC_MAX_N_FIELDS);
ut_ad(data_l + data_c <= REDUNDANT_REC_MAX_DATA_SIZE);
- set_modified();
+ set_modified(block);
static_assert(REC_INFO_MIN_REC_FLAG == 0x10, "compatibility");
static_assert(REC_INFO_DELETED_FLAG == 0x20, "compatibility");
@@ -1201,7 +1201,7 @@ inline void mtr_t::page_insert(const buf_block_t &block, bool reuse,
}
#endif
- set_modified();
+ set_modified(block);
static_assert(REC_INFO_MIN_REC_FLAG == 0x10, "compatibility");
static_assert(REC_INFO_DELETED_FLAG == 0x20, "compatibility");