diff options
| author | unknown <marko@hundin.mysql.fi> | 2004-11-30 17:52:30 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2004-11-30 17:52:30 +0200 |
| commit | 99e69f2660dde2d01f198670274221328c19a43c (patch) | |
| tree | 775ac4ab8fa0c63ac1f96a99afcc44bc8c526aec /innobase/lock | |
| parent | 892cec855512e271fbffc66439fc3b3b06140e2a (diff) | |
| parent | 93d5f62e38fbbb43db406fabb52daed45c1cedf7 (diff) | |
| download | mariadb-git-99e69f2660dde2d01f198670274221328c19a43c.tar.gz | |
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
Diffstat (limited to 'innobase/lock')
| -rw-r--r-- | innobase/lock/lock0lock.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/innobase/lock/lock0lock.c b/innobase/lock/lock0lock.c index 16c4ddfd96d..29a274261f8 100644 --- a/innobase/lock/lock0lock.c +++ b/innobase/lock/lock0lock.c @@ -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 @@ -569,20 +584,6 @@ lock_get_mode( } /************************************************************************* -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 ibool |