diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2013-10-19 15:29:51 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2013-10-19 15:29:51 +0200 |
| commit | 7a524cee32e3a7d457fa6a0e86351ddac1c219fb (patch) | |
| tree | 9b1f8f7ca1a24170880ee3fcc789a76933c1c5a5 /storage | |
| parent | a91fcaf460f686b1fb7eb005fa22ab136ff7210d (diff) | |
| download | mariadb-git-7a524cee32e3a7d457fa6a0e86351ddac1c219fb.tar.gz | |
post-push fix for bug17565888.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/btr/btr0pcur.c | 2 | ||||
| -rw-r--r-- | storage/innobase/include/btr0pcur.ic | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/storage/innobase/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c index d8f43a9ae75..ea187305656 100644 --- a/storage/innobase/btr/btr0pcur.c +++ b/storage/innobase/btr/btr0pcur.c @@ -270,6 +270,7 @@ btr_pcur_restore_position_func( cursor->block_when_stored, cursor->modify_clock, file, line, mtr)) { + cursor->pos_state = BTR_PCUR_IS_POSITIONED; buf_block_dbg_add_level( btr_pcur_get_block(cursor), @@ -283,7 +284,6 @@ btr_pcur_restore_position_func( const ulint* offsets2; #endif /* UNIV_DEBUG */ cursor->latch_mode = latch_mode; - cursor->pos_state = BTR_PCUR_IS_POSITIONED; #ifdef UNIV_DEBUG rec = btr_pcur_get_rec(cursor); diff --git a/storage/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic index db3145132af..647e8d0cde9 100644 --- a/storage/innobase/include/btr0pcur.ic +++ b/storage/innobase/include/btr0pcur.ic @@ -91,8 +91,7 @@ btr_pcur_get_block( /*===============*/ const btr_pcur_t* cursor) /*!< in: persistent cursor */ { - ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC - || cursor->pos_state == BTR_PCUR_IS_POSITIONED); + ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED); return(btr_cur_get_block(btr_pcur_get_btr_cur(cursor))); } @@ -165,8 +164,7 @@ btr_pcur_is_after_last_on_page( /*===========================*/ const btr_pcur_t* cursor) /*!< in: persistent cursor */ { - ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC - || cursor->pos_state == BTR_PCUR_IS_POSITIONED); + ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED); ut_ad(cursor->latch_mode != BTR_NO_LATCHES); return(page_cur_is_after_last(btr_pcur_get_page_cur(cursor))); @@ -311,8 +309,7 @@ btr_pcur_move_to_next_user_rec( function may release the page latch */ mtr_t* mtr) /*!< in: mtr */ { - ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC - || cursor->pos_state == BTR_PCUR_IS_POSITIONED); + ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED); ut_ad(cursor->latch_mode != BTR_NO_LATCHES); cursor->old_stored = BTR_PCUR_OLD_NOT_STORED; loop: |