Skip to content

Commit

Permalink
Remove an orphan declaration lock_rec_enqueue_waiting()
Browse files Browse the repository at this point in the history
MySQL WL#6835 replaced the function lock_rec_enqueue_waiting()
with RecLock::enqueue() and later RecLock::add_to_waitq().
  • Loading branch information
dr-m committed Jun 6, 2017
1 parent da9c30a commit ed2976c
Showing 1 changed file with 0 additions and 26 deletions.
26 changes: 0 additions & 26 deletions storage/innobase/include/lock0lock.h
Original file line number Diff line number Diff line change
Expand Up @@ -302,32 +302,6 @@ lock_rec_insert_check_and_lock(
record */
MY_ATTRIBUTE((warn_unused_result));

/*********************************************************************//**
Enqueues a waiting request for a lock which cannot be granted immediately.
Checks for deadlocks.
@return DB_LOCK_WAIT, DB_DEADLOCK, or DB_QUE_THR_SUSPENDED, or
DB_SUCCESS_LOCKED_REC; DB_SUCCESS_LOCKED_REC means that
there was a deadlock, but another transaction was chosen as a victim,
and we got the lock immediately: no need to wait then */
dberr_t
lock_rec_enqueue_waiting(
/*=====================*/
ulint type_mode,/*!< in: lock mode this
transaction is requesting:
LOCK_S or LOCK_X, possibly
ORed with LOCK_GAP or
LOCK_REC_NOT_GAP, ORed with
LOCK_INSERT_INTENTION if this
waiting lock request is set
when performing an insert of
an index record */
const buf_block_t* block, /*!< in: buffer block containing
the record */
ulint heap_no,/*!< in: heap number of the record */
dict_index_t* index, /*!< in: index of record */
que_thr_t* thr, /*!< in: query thread */
lock_prdt_t* prdt); /*!< in: Minimum Bounding Box */

/*********************************************************************//**
Checks if locks of other transactions prevent an immediate modify (update,
delete mark, or delete unmark) of a clustered index record. If they do,
Expand Down

0 comments on commit ed2976c

Please sign in to comment.