diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-11 15:03:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-11 15:03:46 +0200 |
| commit | 3da895a736a15413d9873a16ea7ece0dd03ac0f7 (patch) | |
| tree | 9318890208ff3353ddd08b6f5adf242dfa4ac07e /storage/innobase/btr/btr0pcur.cc | |
| parent | 74892bda3a75172f6c81d735de5bc90a4039ae33 (diff) | |
| parent | 4fcfdb60e788c6c8cebe35e2e0f8d9595cc9e930 (diff) | |
| download | mariadb-git-3da895a736a15413d9873a16ea7ece0dd03ac0f7.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/btr/btr0pcur.cc')
| -rw-r--r-- | storage/innobase/btr/btr0pcur.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc index a66fcc15187..2848f8d3e96 100644 --- a/storage/innobase/btr/btr0pcur.cc +++ b/storage/innobase/btr/btr0pcur.cc @@ -457,7 +457,7 @@ btr_pcur_move_to_next_page( return; } - next_page_no = btr_page_get_next(page, mtr); + next_page_no = btr_page_get_next(page); ut_ad(next_page_no != FIL_NULL); @@ -484,7 +484,7 @@ btr_pcur_move_to_next_page( next_page = buf_block_get_frame(next_block); #ifdef UNIV_BTR_DEBUG ut_a(page_is_comp(next_page) == page_is_comp(page)); - ut_a(btr_page_get_prev(next_page, mtr) + ut_a(btr_page_get_prev(next_page) == btr_pcur_get_block(cursor)->page.id.page_no()); #endif /* UNIV_BTR_DEBUG */ @@ -546,7 +546,7 @@ btr_pcur_move_backward_from_page( page = btr_pcur_get_page(cursor); - prev_page_no = btr_page_get_prev(page, mtr); + prev_page_no = btr_page_get_prev(page); if (prev_page_no == FIL_NULL) { } else if (btr_pcur_is_before_first_on_page(cursor)) { |