Merge mysql-5.1 to mysql-5.5.
This commit is contained in:
commit
dc6af817c3
@ -247,6 +247,8 @@ btr_pcur_restore_position_func(
|
|||||||
cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE,
|
cursor->rel_pos == BTR_PCUR_BEFORE_FIRST_IN_TREE,
|
||||||
index, latch_mode, btr_pcur_get_btr_cur(cursor), mtr);
|
index, latch_mode, btr_pcur_get_btr_cur(cursor), mtr);
|
||||||
|
|
||||||
|
cursor->latch_mode = latch_mode;
|
||||||
|
cursor->pos_state = BTR_PCUR_IS_POSITIONED;
|
||||||
cursor->block_when_stored = btr_pcur_get_block(cursor);
|
cursor->block_when_stored = btr_pcur_get_block(cursor);
|
||||||
|
|
||||||
return(FALSE);
|
return(FALSE);
|
||||||
|
@ -263,14 +263,6 @@ btr_pcur_commit_specify_mtr(
|
|||||||
/*========================*/
|
/*========================*/
|
||||||
btr_pcur_t* pcur, /*!< in: persistent cursor */
|
btr_pcur_t* pcur, /*!< in: persistent cursor */
|
||||||
mtr_t* mtr); /*!< in: mtr to commit */
|
mtr_t* mtr); /*!< in: mtr to commit */
|
||||||
/**************************************************************//**
|
|
||||||
Tests if a cursor is detached: that is the latch mode is BTR_NO_LATCHES.
|
|
||||||
@return TRUE if detached */
|
|
||||||
UNIV_INLINE
|
|
||||||
ibool
|
|
||||||
btr_pcur_is_detached(
|
|
||||||
/*=================*/
|
|
||||||
btr_pcur_t* pcur); /*!< in: persistent cursor */
|
|
||||||
/*********************************************************//**
|
/*********************************************************//**
|
||||||
Moves the persistent cursor to the next record in the tree. If no records are
|
Moves the persistent cursor to the next record in the tree. If no records are
|
||||||
left, the cursor stays 'after last in tree'.
|
left, the cursor stays 'after last in tree'.
|
||||||
|
@ -388,38 +388,6 @@ btr_pcur_commit_specify_mtr(
|
|||||||
pcur->pos_state = BTR_PCUR_WAS_POSITIONED;
|
pcur->pos_state = BTR_PCUR_WAS_POSITIONED;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**************************************************************//**
|
|
||||||
Sets the pcur latch mode to BTR_NO_LATCHES. */
|
|
||||||
UNIV_INLINE
|
|
||||||
void
|
|
||||||
btr_pcur_detach(
|
|
||||||
/*============*/
|
|
||||||
btr_pcur_t* pcur) /*!< in: persistent cursor */
|
|
||||||
{
|
|
||||||
ut_a(pcur->pos_state == BTR_PCUR_IS_POSITIONED);
|
|
||||||
|
|
||||||
pcur->latch_mode = BTR_NO_LATCHES;
|
|
||||||
|
|
||||||
pcur->pos_state = BTR_PCUR_WAS_POSITIONED;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************//**
|
|
||||||
Tests if a cursor is detached: that is the latch mode is BTR_NO_LATCHES.
|
|
||||||
@return TRUE if detached */
|
|
||||||
UNIV_INLINE
|
|
||||||
ibool
|
|
||||||
btr_pcur_is_detached(
|
|
||||||
/*=================*/
|
|
||||||
btr_pcur_t* pcur) /*!< in: persistent cursor */
|
|
||||||
{
|
|
||||||
if (pcur->latch_mode == BTR_NO_LATCHES) {
|
|
||||||
|
|
||||||
return(TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
return(FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**************************************************************//**
|
/**************************************************************//**
|
||||||
Sets the old_rec_buf field to NULL. */
|
Sets the old_rec_buf field to NULL. */
|
||||||
UNIV_INLINE
|
UNIV_INLINE
|
||||||
|
Loading…
x
Reference in New Issue
Block a user