diff options
| author | Sergey Vojtovich <svoj@sun.com> | 2010-04-01 15:56:38 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@sun.com> | 2010-04-01 15:56:38 +0400 |
| commit | 6a2f4b47746f86d6ca228ae99267154cc3bb06a4 (patch) | |
| tree | 90d8dc65a9c6c46a1d3a52d2b6154b891e962197 /storage | |
| parent | 09a8580b40f51b81e62926108a1a60e377a1db33 (diff) | |
| download | mariadb-git-6a2f4b47746f86d6ca228ae99267154cc3bb06a4.tar.gz | |
Applying InnoDB snapshot
Detailed revision comments:
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innodb_plugin/lock/lock0lock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c index 1de612ef637..325ebc846bb 100644 --- a/storage/innodb_plugin/lock/lock0lock.c +++ b/storage/innodb_plugin/lock/lock0lock.c @@ -3753,9 +3753,10 @@ lock_table_enqueue_waiting( /*********************************************************************//** Checks if other transactions have an incompatible mode lock request in -the lock queue. */ +the lock queue. +@return lock or NULL */ UNIV_INLINE -ibool +lock_t* lock_table_other_has_incompatible( /*==============================*/ trx_t* trx, /*!< in: transaction, or NULL if all @@ -3777,13 +3778,13 @@ lock_table_other_has_incompatible( && (!lock_mode_compatible(lock_get_mode(lock), mode)) && (wait || !(lock_get_wait(lock)))) { - return(TRUE); + return(lock); } lock = UT_LIST_GET_PREV(un_member.tab_lock.locks, lock); } - return(FALSE); + return(NULL); } /*********************************************************************//** |