List:Commits« Previous MessageNext Message »
From:Sunny Bains Date:June 11 2010 12:47am
Subject:bzr commit into mysql-5.6-sunny branch (Sunny.Bains:3141)
View as plain text  
#At file:///Users/sunny/innodb/bzr-new/5.6/ based on revid:sunny.bains@stripped

 3141 Sunny Bains	2010-06-11
      Improve the check before locking the transaction for trx_print().

    modified:
      storage/innobase/lock/lock0lock.c
=== modified file 'storage/innobase/lock/lock0lock.c'
--- a/storage/innobase/lock/lock0lock.c	revid:sunny.bains@stripped
+++ b/storage/innobase/lock/lock0lock.c	revid:sunny.bains@stripped
@@ -3489,13 +3489,15 @@ lock_deadlock_recursive(
 
 				fputs("\n*** (1) TRANSACTION:\n", ef);
 
-				if (wait_lock->trx != start) {
+				if (wait_lock->trx != trx
+				    && wait_lock->trx != start) {
 					trx_mutex_enter(wait_lock->trx);
 				}
 
 				trx_print(ef, wait_lock->trx, 3000);
 
-				if (wait_lock->trx != start) {
+				if (wait_lock->trx != trx
+				    && wait_lock->trx != start) {
 					trx_mutex_exit(wait_lock->trx);
 				}
 
@@ -3510,13 +3512,15 @@ lock_deadlock_recursive(
 
 				fputs("*** (2) TRANSACTION:\n", ef);
 
-				if (lock->trx != trx) {
+				if (wait_lock->trx != trx
+				    && wait_lock->trx != start) {
 					trx_mutex_enter(lock->trx);
 				}
 
 				trx_print(ef, lock->trx, 3000);
 
-				if (lock->trx != trx) {
+				if (wait_lock->trx != trx
+				    && wait_lock->trx != start) {
 					trx_mutex_exit(lock->trx);
 				}
 


Attachment: [text/bzr-bundle] bzr/sunny.bains@oracle.com-20100611004634-py3u1s7lk0zwgl0g.bundle
Thread
bzr commit into mysql-5.6-sunny branch (Sunny.Bains:3141) Sunny Bains11 Jun