bk commit into 6.0 tree (cpowers:1.2811) BUG#33634

[cpowers]

Below is the list of changes that have just been committed into a local
6.0 repository of cpowers. When cpowers does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-10 20:15:36-06:00, cpowers@stripped +1 -0
  Bug#33634, Falcon queries starved for a long time
  Disabled assert in SRLUpdateRecords::chill.

  storage/falcon/SRLUpdateRecords.cpp@stripped, 2008-02-10 20:15:34-06:00, cpowers@stripped +4 -2
    Disabled ASSERT(transaction->totalRecordData >= dataLength) in
    SRLUpdateRecords::chill. This assert should only be used when
    debugging the chill/thaw mechanism. Sometimes totalRecordData
    can be off by a few bytes, especially for transactions with
    thousands of records.

diff -Nrup a/storage/falcon/SRLUpdateRecords.cpp b/storage/falcon/SRLUpdateRecords.cpp
--- a/storage/falcon/SRLUpdateRecords.cpp	2008-02-08 10:32:32 -06:00
+++ b/storage/falcon/SRLUpdateRecords.cpp	2008-02-10 20:15:34 -06:00
@@ -48,10 +48,12 @@ void SRLUpdateRecords::chill(Transaction
 	// Update transaction counter and chillPoint
 	
 	transaction->chillPoint = &record->nextInTrans;
-	ASSERT(transaction->totalRecordData >= dataLength);
-	
+
+	//ASSERT(transaction->totalRecordData >= dataLength);
 	if (transaction->totalRecordData >= dataLength)
 		transaction->totalRecordData -= dataLength;
+	else
+		transaction->totalRecordData = 0;
 }
 
 int SRLUpdateRecords::thaw(RecordVersion *record, bool *thawed)