push into mysql-6.0-falcon branch (cpowers:2778)

[Christopher Powers]

------------------------------------------------------------
revno: 2778
revision-id: cpowers@stripped
parent: vvaintroub@stripped
committer: Christopher Powers <cpowers@stripped>
branch nick: mysql
timestamp: Thu 2008-08-14 00:45:00 -0500
message:
  Disabled new asserts in Transaction::releaseDependecies introduced in commit:
http://lists.mysql.com/commits/51491
modified:
  storage/falcon/Transaction.cpp
sp1f-transaction.cpp-20070920154246-vnpv54o6mk2d3nj3hnvg54ln4eijadww
=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp	2008-08-13 10:18:40 +0000
+++ b/storage/falcon/Transaction.cpp	2008-08-14 05:45:00 +0000
@@ -783,8 +783,9 @@
 
 			if (COMPARE_EXCHANGE_POINTER(&state->transaction, transaction, NULL))
 				{
-				ASSERT(transaction->transactionId == state->transactionId ||
transaction->transactionId == 0);
-				ASSERT(transaction->state == Active || transaction->state == Available);
+				//ASSERT(transaction->transactionId == state->transactionId ||
transaction->transactionId == 0);
+				ASSERT(transaction->transactionId == state->transactionId ||
transaction->state == Available);
+				//ASSERT(transaction->state == Active || transaction->state == Available);
 				transaction->releaseDependency();
 				}
 			}