diff options
Diffstat (limited to 'storage/innobase/include/lock0lock.ic')
-rw-r--r-- | storage/innobase/include/lock0lock.ic | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/storage/innobase/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic index c6719946b79..abe5052627b 100644 --- a/storage/innobase/include/lock0lock.ic +++ b/storage/innobase/include/lock0lock.ic @@ -101,37 +101,34 @@ lock_hash_get( /*********************************************************************//** Creates a new record lock and inserts it to the lock queue. Does NOT check for deadlocks or lock compatibility! -@param[in] c_lock conflicting lock -@param[in] thr thread owning trx -@param[in] type_mode lock mode and wait flag, type is ignored and replaced by -LOCK_REC -@param[in] block buffer block containing the record -@param[in] heap_no heap number of the record -@param[in] index index of record -@param[in,out] trx transaction -@param[in] caller_owns_trx_mutex TRUE if caller owns trx mutex -@param[in] insert_before_waiting if true, inserts new B-tree record lock -just after the last non-waiting lock of the current transaction which is -located before the first waiting for the current transaction lock, otherwise -the lock is inserted at the end of the queue @return created lock */ UNIV_INLINE -lock_t *lock_rec_create(lock_t *c_lock, +lock_t* +lock_rec_create( +/*============*/ #ifdef WITH_WSREP - que_thr_t *thr, + lock_t* c_lock, /*!< conflicting lock */ + que_thr_t* thr, /*!< thread owning trx */ #endif - ulint type_mode, const buf_block_t *block, - ulint heap_no, dict_index_t *index, trx_t *trx, - bool caller_owns_trx_mutex, - bool insert_before_waiting) + ulint type_mode,/*!< in: lock mode and wait + flag, type is ignored and + replaced by LOCK_REC */ + 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 */ + trx_t* trx, /*!< in,out: transaction */ + bool caller_owns_trx_mutex) + /*!< in: TRUE if caller owns + trx mutex */ { btr_assert_not_corrupted(block, index); - return lock_rec_create_low(c_lock, + return lock_rec_create_low( #ifdef WITH_WSREP - thr, + c_lock, thr, #endif type_mode, block->page.id.space(), block->page.id.page_no(), - block->frame, heap_no, index, trx, - caller_owns_trx_mutex, insert_before_waiting); + block->frame, heap_no, + index, trx, caller_owns_trx_mutex); } |