Commit b0266b6a authored by Marko Mäkelä's avatar Marko Mäkelä

Use mtr_memo_contains_flagged() instead of mtr_memo_contains().

This was originally part of MDEV-11487.
parent 63152a52
...@@ -127,12 +127,14 @@ btr_pcur_store_position( ...@@ -127,12 +127,14 @@ btr_pcur_store_position(
ut_ad((mtr_memo_contains_flagged( ut_ad((mtr_memo_contains_flagged(
mtr, dict_index_get_lock(index), mtr, dict_index_get_lock(index),
MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK) MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK)
|| mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX) || mtr_memo_contains_flagged(mtr, block,
|| mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)) MTR_MEMO_PAGE_S_FIX
| MTR_MEMO_PAGE_X_FIX))
&& (block->page.buf_fix_count > 0)); && (block->page.buf_fix_count > 0));
} else { } else {
ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX) ut_ad(mtr_memo_contains_flagged(mtr, block,
|| mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX) MTR_MEMO_PAGE_S_FIX
| MTR_MEMO_PAGE_X_FIX)
|| dict_table_is_intrinsic(index->table)); || dict_table_is_intrinsic(index->table));
} }
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment