bzr commit into mysql-6.0-falcon branch (vvaintroub:2780)

[Vladislav Vaintroub]

#At file:///C:/bzr/mysql-6.0-falcon-team/

 2780 Vladislav Vaintroub	2008-08-14 [merge]
      merge
modified:
  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 @@ void Transaction::releaseDependencies()
 
 			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();
 				}
 			}