bzr commit into mysql-6.0-falcon-team branch (kevin.lewis:3084)

[Kevin Lewis]

#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/ based on revid:kevin.lewis@stripped

 3084 Kevin Lewis	2009-03-27
      Allow RecordScavenge::canBeRetired() to check if the transaction is purged.

    modified:
      storage/falcon/RecordScavenge.cpp
      storage/falcon/Transaction.cpp
      storage/falcon/TransactionState.cpp
      storage/falcon/TransactionState.h
=== modified file 'storage/falcon/RecordScavenge.cpp'
--- a/storage/falcon/RecordScavenge.cpp	2009-03-25 22:11:35 +0000
+++ b/storage/falcon/RecordScavenge.cpp	2009-03-27 06:02:28 +0000
@@ -90,7 +90,7 @@ bool RecordScavenge::canBeRetired(Record
 		RecordVersion * recVer = (RecordVersion *) record;
 		
 		//if (!recVer->transaction)
-		if (recVer->transactionState->isCommitted())
+		if (recVer->transactionState->hasTransactionReference)
 			return true;
 		}
 

=== modified file 'storage/falcon/Transaction.cpp'
--- a/storage/falcon/Transaction.cpp	2009-03-27 04:29:33 +0000
+++ b/storage/falcon/Transaction.cpp	2009-03-27 06:02:28 +0000
@@ -97,6 +97,7 @@ Transaction::Transaction(Connection *cnc
 	firstRecord = NULL;
 	lastRecord = NULL;
 	transactionState = new TransactionState();
+	transactionState->hasTransactionReference = true;
 	initialize(cnct, seq);
 }
 

=== modified file 'storage/falcon/TransactionState.cpp'
--- a/storage/falcon/TransactionState.cpp	2009-03-27 04:29:33 +0000
+++ b/storage/falcon/TransactionState.cpp	2009-03-27 06:02:28 +0000
@@ -24,6 +24,7 @@ TransactionState::TransactionState()
 {
 	syncIsActive.setName("TransactionState::syncIaActive");
 	pendingPageWrites = false;
+	hasTransactionReference = false;
 	waitingFor = NULL;
 	commitId = 0;
 	useCount = 1;

=== modified file 'storage/falcon/TransactionState.h'
--- a/storage/falcon/TransactionState.h	2009-03-27 04:29:33 +0000
+++ b/storage/falcon/TransactionState.h	2009-03-27 06:02:28 +0000
@@ -77,6 +77,7 @@ public:
 	volatile		INTERLOCK_TYPE state;
 	SyncObject 		syncIsActive;
 	bool			pendingPageWrites;
+	bool			hasTransactionReference;
 	
 	volatile TransactionState* waitingFor; // Used for deadlock detection
 


Attachment: [text/bzr-bundle] bzr/[e-mail]