bk commit into 6.0 tree (jas:1.2789)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
6.0 repository of jas. When jas 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-01-24 17:52:55-05:00, jas@stripped +2 -0
  Undo an apparent "benign" change in SRLUpdateIndex::append().

  storage/falcon/SRLUpdateIndex.cpp@stripped, 2008-01-24 17:52:52-05:00,
jas@stripped +3 -4
    Undo an apparent "benign" change in SRLUpdateIndex::append().

  storage/falcon/SerialLogControl.cpp@stripped, 2008-01-24 17:52:52-05:00,
jas@stripped +1 -0
    Put in a test for valid serial log record type while traversing
    the serial log.

diff -Nrup a/storage/falcon/SRLUpdateIndex.cpp b/storage/falcon/SRLUpdateIndex.cpp
--- a/storage/falcon/SRLUpdateIndex.cpp	2008-01-24 15:00:00 -05:00
+++ b/storage/falcon/SRLUpdateIndex.cpp	2008-01-24 17:52:52 -05:00
@@ -50,10 +50,6 @@ void SRLUpdateIndex::append(DeferredInde
 	int tableSpaceId = deferredIndex->index->dbb->tableSpaceId;
 	uint64 virtualOffset = 0;
 	uint64 virtualOffsetAtEnd = 0;
-	
-	SerialLogTransaction *srlTrans = log->getTransaction(transaction->transactionId);
-	srlTrans->setTransaction(transaction);
-	ASSERT(transaction->writePending);
 
 	// Remember where this is logged
 	
@@ -63,6 +59,9 @@ void SRLUpdateIndex::append(DeferredInde
 		{
 		START_RECORD(srlUpdateIndex, "SRLUpdateIndex::append");
 		log->updateIndexUseVector(indexId, tableSpaceId, 1);
+		SerialLogTransaction *srlTrans = log->getTransaction(transaction->transactionId);
+		srlTrans->setTransaction(transaction);
+		ASSERT(transaction->writePending);
 		putInt(tableSpaceId);
 		putInt(transaction->transactionId);
 		putInt(indexId);
diff -Nrup a/storage/falcon/SerialLogControl.cpp b/storage/falcon/SerialLogControl.cpp
--- a/storage/falcon/SerialLogControl.cpp	2007-11-21 17:10:20 -05:00
+++ b/storage/falcon/SerialLogControl.cpp	2008-01-24 17:52:52 -05:00
@@ -332,6 +332,7 @@ SerialLogRecord* SerialLogControl::nextR
 		}
 
 	ASSERT(version > 0);
+	ASSERT(type < srlMax);
 	SerialLogRecord *record = records[type];
 	record->read();