From: Date: August 13 2008 10:52am
Subject: bzr push into mysql-6.0-falcon branch (olav:2776)
List-Archive: http://lists.mysql.com/commits/51491
Message-Id: <20080813085253.7052.qmail@khepri11>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2776 Olav Sandstaa	2008-08-13 [merge]
      Merging.... 
modified:
  configure.in
  mysql-test/suite/falcon/t/disabled.def
  storage/falcon/Database.cpp
  storage/falcon/Database.h
  storage/falcon/MemMgr.cpp
  storage/falcon/StorageTable.cpp
  storage/falcon/StorageTable.h
  storage/falcon/Table.cpp
  storage/falcon/Table.h
  storage/falcon/Transaction.cpp
  storage/falcon/Transaction.h
  storage/falcon/TransactionManager.cpp
  storage/falcon/TransactionManager.h
  storage/falcon/ha_falcon.cpp

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

=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp	2008-08-11 13:22:53 +0000
+++ b/storage/falcon/Transaction.cpp	2008-08-13 08:48:34 +0000
@@ -783,7 +783,8 @@
 
 			if (COMPARE_EXCHANGE_POINTER(&state->transaction, transaction, NULL))
 				{
-				ASSERT(transaction->transactionId == state->transactionId || transaction->state == Available);
+				ASSERT(transaction->transactionId == state->transactionId || transaction->transactionId == 0);
+				ASSERT(transaction->state == Active || transaction->state == Available);
 				transaction->releaseDependency();
 				}
 			}