From: Date: August 14 2008 1:18pm
Subject: bzr commit into mysql-6.0-falcon branch (olav:2779) Bug#35932
List-Archive: http://lists.mysql.com/commits/51620
X-Bug: 35932
Message-Id: <20080814111849.7883.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-bug35932/

 2779 Olav Sandstaa	2008-08-14
      Follow-up fix to Bug#35932 Falcon crashes in Transaction::commitNoUpdates for simple SELECT queries
            
      The initial assert added in commit http://lists.mysql.com/commits/51491 was too strict. Change this to only
      assert if the state of the transaction the dependency is pointing to is Initializing.
modified:
  storage/falcon/Transaction.cpp

per-file messages:
  storage/falcon/Transaction.cpp
    The initial assert added in commit http://lists.mysql.com/commits/51491 was too strict. Change this to only
    assert if the state of the transaction the dependency is pointing to is Initializing.
=== modified file 'storage/falcon/Transaction.cpp'

=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp	2008-08-14 05:45:00 +0000
+++ b/storage/falcon/Transaction.cpp	2008-08-14 11:18:42 +0000
@@ -783,9 +783,8 @@
 
 			if (COMPARE_EXCHANGE_POINTER(&state->transaction, transaction, NULL))
 				{
-				//ASSERT(transaction->transactionId == state->transactionId || transaction->transactionId == 0);
-				ASSERT(transaction->transactionId == state->transactionId || transaction->state == Available);
-				//ASSERT(transaction->state == Active || transaction->state == Available);
+				ASSERT(transaction->transactionId == state->transactionId || transaction->transactionId == 0);
+				ASSERT(transaction->state != Initializing);
 				transaction->releaseDependency();
 				}
 			}