MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Vojtovich Date:April 1 2010 11:56am
Subject:bzr commit into mysql-5.1-bugteam branch (svoj:3506)
View as plain text  
#At file:///home/svoj/devel/innodb-snapshots/mysql-5.1-bugteam/ based on revid:svoj@stripped

 3506 Sergey Vojtovich	2010-04-01
      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.

    modified:
      storage/innodb_plugin/lock/lock0lock.c
=== modified file 'storage/innodb_plugin/lock/lock0lock.c'
--- a/storage/innodb_plugin/lock/lock0lock.c	2010-04-01 11:42:24 +0000
+++ b/storage/innodb_plugin/lock/lock0lock.c	2010-04-01 11:56:38 +0000
@@ -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);
 }
 
 /*********************************************************************//**


Attachment: [text/bzr-bundle] bzr/svoj@sun.com-20100401115638-w08evifu96zc7sav.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (svoj:3506)Sergey Vojtovich1 Apr