Commit 93d5f62e authored by unknown's avatar unknown

lock0lock.c:

  If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this


innobase/lock/lock0lock.c:
  If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
parent 668d61b9
...@@ -365,6 +365,21 @@ lock_deadlock_recursive( ...@@ -365,6 +365,21 @@ lock_deadlock_recursive(
ulint* cost); /* in/out: number of calculation steps thus ulint* cost); /* in/out: number of calculation steps thus
far: if this exceeds LOCK_MAX_N_STEPS_... far: if this exceeds LOCK_MAX_N_STEPS_...
we return TRUE */ we return TRUE */
/*************************************************************************
Gets the type of a lock. */
UNIV_INLINE
ulint
lock_get_type(
/*==========*/
/* out: LOCK_TABLE or LOCK_REC */
lock_t* lock) /* in: lock */
{
ut_ad(lock);
return(lock->type_mode & LOCK_TYPE_MASK);
}
/************************************************************************* /*************************************************************************
Gets the nth bit of a record lock. */ Gets the nth bit of a record lock. */
UNIV_INLINE UNIV_INLINE
...@@ -581,20 +596,6 @@ lock_get_mode( ...@@ -581,20 +596,6 @@ lock_get_mode(
return(lock->type_mode & LOCK_MODE_MASK); return(lock->type_mode & LOCK_MODE_MASK);
} }
/*************************************************************************
Gets the type of a lock. */
UNIV_INLINE
ulint
lock_get_type(
/*==========*/
/* out: LOCK_TABLE or LOCK_REC */
lock_t* lock) /* in: lock */
{
ut_ad(lock);
return(lock->type_mode & LOCK_TYPE_MASK);
}
/************************************************************************* /*************************************************************************
Gets the wait flag of a lock. */ Gets the wait flag of a lock. */
UNIV_INLINE UNIV_INLINE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment