From: Date: October 10 2008 8:42pm
Subject: bzr commit into mysql-6.0-falcon-team branch (olav:2862) Bug#38748
List-Archive: http://lists.mysql.com/commits/56054
X-Bug: 38748
Message-Id: <20081010184254.22016.qmail@khepri11>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/os136802/mysql/develop/repo/falcon-bug38748/

 2862 Olav Sandstaa	2008-10-10
      Fix for Bug#38748 Deadlock in Falcon when running simple SELECT queries
      
      Remove debug code that locks the transaction manager. This code have participated in deadlocks.
modified:
  storage/falcon/Transaction.cpp

=== modified file 'storage/falcon/Transaction.cpp'

=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp	2008-10-02 23:51:36 +0000
+++ b/storage/falcon/Transaction.cpp	2008-10-10 18:42:44 +0000
@@ -786,12 +786,6 @@
 
 		if (transaction)
 			{
-			if (transaction->transactionId != state->transactionId)
-				{
-				Transaction *transaction = database->transactionManager->findTransaction(state->transactionId);
-				ASSERT(transaction == NULL);
-				}
-
 			if (COMPARE_EXCHANGE_POINTER(&state->transaction, transaction, NULL))
 				{
 				ASSERT(transaction->transactionId == state->transactionId || transaction->transactionId == 0);