1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

post-push fix for bug17565888.

Browse Source
This commit is contained in:
Mattias Jonsson 2013-10-19 15:29:51 +02:00
parent a91fcaf460
commit 7a524cee32
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/innobase/btr/btr0pcur.c
View File

@ -270,6 +270,7 @@ btr_pcur_restore_position_func(
cursor->block_when_stored, cursor->block_when_stored,
cursor->modify_clock, cursor->modify_clock,
file, line, mtr)) { file, line, mtr)) {
cursor->pos_state = BTR_PCUR_IS_POSITIONED;
buf_block_dbg_add_level( buf_block_dbg_add_level(
btr_pcur_get_block(cursor), btr_pcur_get_block(cursor),
@ -283,7 +284,6 @@ btr_pcur_restore_position_func(
const ulint* offsets2; const ulint* offsets2;
#endif /* UNIV_DEBUG */ #endif /* UNIV_DEBUG */
cursor->latch_mode = latch_mode; cursor->latch_mode = latch_mode;
cursor->pos_state = BTR_PCUR_IS_POSITIONED;
#ifdef UNIV_DEBUG #ifdef UNIV_DEBUG
rec = btr_pcur_get_rec(cursor); rec = btr_pcur_get_rec(cursor);

9
storage/innobase/include/btr0pcur.ic
View File

@ -91,8 +91,7 @@ btr_pcur_get_block(
/*===============*/ /*===============*/
const btr_pcur_t* cursor) /*!< in: persistent cursor */ const btr_pcur_t* cursor) /*!< in: persistent cursor */
{ {
ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|| cursor->pos_state == BTR_PCUR_IS_POSITIONED);
return(btr_cur_get_block(btr_pcur_get_btr_cur(cursor))); 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 */ const btr_pcur_t* cursor) /*!< in: persistent cursor */
{ {
ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|| cursor->pos_state == BTR_PCUR_IS_POSITIONED);
ut_ad(cursor->latch_mode != BTR_NO_LATCHES); ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
return(page_cur_is_after_last(btr_pcur_get_page_cur(cursor))); 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 */ function may release the page latch */
mtr_t* mtr) /*!< in: mtr */ mtr_t* mtr) /*!< in: mtr */
{ {
ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED_OPTIMISTIC ut_ad(cursor->pos_state == BTR_PCUR_IS_POSITIONED);
|| cursor->pos_state == BTR_PCUR_IS_POSITIONED);
ut_ad(cursor->latch_mode != BTR_NO_LATCHES); ut_ad(cursor->latch_mode != BTR_NO_LATCHES);
cursor->old_stored = BTR_PCUR_OLD_NOT_STORED; cursor->old_stored = BTR_PCUR_OLD_NOT_STORED;
loop: loop: