diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-09 12:03:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-09 12:03:24 +0200 |
| commit | b0266b6a606479f183315248e10eb1624200c06b (patch) | |
| tree | e635bb1137dd9809655d0a861404bb920841bf5f /storage/innobase | |
| parent | 63152a52dac85e5511365c9502d1e9900c0976f3 (diff) | |
| download | mariadb-git-b0266b6a606479f183315248e10eb1624200c06b.tar.gz | |
Use mtr_memo_contains_flagged() instead of mtr_memo_contains().
This was originally part of MDEV-11487.
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/btr/btr0pcur.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc index a5da1b9fb0c..540bb0aa1f4 100644 --- a/storage/innobase/btr/btr0pcur.cc +++ b/storage/innobase/btr/btr0pcur.cc @@ -127,12 +127,14 @@ btr_pcur_store_position( ut_ad((mtr_memo_contains_flagged( mtr, dict_index_get_lock(index), MTR_MEMO_X_LOCK | MTR_MEMO_SX_LOCK) - || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX) - || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX)) + || mtr_memo_contains_flagged(mtr, block, + MTR_MEMO_PAGE_S_FIX + | MTR_MEMO_PAGE_X_FIX)) && (block->page.buf_fix_count > 0)); } else { - ut_ad(mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_S_FIX) - || mtr_memo_contains(mtr, block, MTR_MEMO_PAGE_X_FIX) + ut_ad(mtr_memo_contains_flagged(mtr, block, + MTR_MEMO_PAGE_S_FIX + | MTR_MEMO_PAGE_X_FIX) || dict_table_is_intrinsic(index->table)); } #endif /* UNIV_DEBUG */ |