bzr commit into mysql-6.0-falcon-team branch (kevin.lewis:2795) Bug#47487

[Kevin Lewis]

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

 2795 Kevin Lewis	2009-09-22
      Bug#47487 - In RecordScavenge::canBeSnipped(), make sure
      that the transactionStates are not NULL.
     @ storage/falcon/RecordScavenge.cpp
        Bug#47487 - In RecordScavenge::canBeSnipped(), make sure
        that the transactionStates are not NULL.

    modified:
      storage/falcon/RecordScavenge.cpp
=== modified file 'storage/falcon/RecordScavenge.cpp'
--- a/storage/falcon/RecordScavenge.cpp	2009-09-22 17:20:10 +0000
+++ b/storage/falcon/RecordScavenge.cpp	2009-09-22 17:26:55 +0000
@@ -115,6 +115,9 @@ bool RecordScavenge::canBeRetired(Record
 
 bool RecordScavenge::canBeSnipped(TransactionState* olderTransState, TransactionState* youngerTransState)
 {
+	if (!olderTransState || !youngerTransState)
+		return false;
+
 	if (olderTransState->transactionId >= youngerTransState->transactionId)
 		return false;				// It won't be > but it might be ==
 


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