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

[Kevin Lewis]

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

 2719 Kevin Lewis	2009-06-04
      Bug#43344 - One more cleanup.  RecordVersion::hasData() should act like RecordVersion::getRecordData() by testing the recordData returned from thaw() instead of calling isChilled() which tests data.record again.  The record can immediately get re-chilled.  And that actually happened in a pushbuld test.

    modified:
      storage/falcon/RecordVersion.cpp
=== modified file 'storage/falcon/RecordVersion.cpp'
--- a/storage/falcon/RecordVersion.cpp	2009-06-03 18:15:32 +0000
+++ b/storage/falcon/RecordVersion.cpp	2009-06-04 12:55:34 +0000
@@ -548,7 +548,7 @@ bool RecordVersion::hasRecord(void)
 	if (isChilled())
 		{
 		recordData = thaw();
-		ASSERT(!isChilled());
+		ASSERT(recordData != recordIsChilled);
 		return (recordData != NULL);
 		}
 


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