Commit 99e69f26 authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/lock/lock0lock.c:
  Auto merged
parents 892cec85 93d5f62e

innobase/lock/lock0lock.c

+15 −14
Original line number Diff line number Diff line
@@ -365,6 +365,21 @@ lock_deadlock_recursive( 
	ulint*	cost);		/* in/out: number of calculation steps thus

				far: if this exceeds LOCK_MAX_N_STEPS_...

				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. */

UNIV_INLINE
@@ -568,20 +583,6 @@ lock_get_mode( 
	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. */

UNIV_INLINE