bk commit into 6.0 tree (jas:1.2672)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  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, 2007-11-01 12:50:25-04:00, jas@rowvwade. +5 -0
  Fix stupid cut and paste bug in SRLUpdateBlob.

  storage/falcon/SRLIndexDelete.cpp@stripped, 2007-11-01 12:50:16-04:00, jas@rowvwade. +1 -2
    Remove debugging code.

  storage/falcon/SRLRecordLocator.cpp@stripped, 2007-11-01 12:50:16-04:00, jas@rowvwade. +1 -1
    Change "srlSectionIndex" to "srlRecordLocator" for clarity and
    consistency.

  storage/falcon/SRLUpdateBlob.cpp@stripped, 2007-11-01 12:50:17-04:00, jas@rowvwade. +1 -1
    Fix stupid cut and paste error.  Bad Jim!  Bad Jim!

  storage/falcon/SerialLogControl.cpp@stripped, 2007-11-01 12:50:17-04:00, jas@rowvwade. +1 -1
    Change "srlSectionIndex" to "srlRecordLocator" for clarity and
    consistency.

  storage/falcon/SerialLogRecord.h@stripped, 2007-11-01 12:50:17-04:00, jas@rowvwade. +1 -1
    Change "srlSectionIndex" to "srlRecordLocator" for clarity and
    consistency.

diff -Nrup a/storage/falcon/SRLIndexDelete.cpp b/storage/falcon/SRLIndexDelete.cpp
--- a/storage/falcon/SRLIndexDelete.cpp	2007-11-01 11:59:17 -04:00
+++ b/storage/falcon/SRLIndexDelete.cpp	2007-11-01 12:50:16 -04:00
@@ -48,7 +48,7 @@ SRLIndexDelete::~SRLIndexDelete()
 
 void SRLIndexDelete::append(Dbb *dbb, int32 indexId, int idxVersion, IndexKey *key, int32 recordNumber, TransId transactionId)
 {
-	ASSERT(idxVersion <= INDEX_CURRENT_VERSION);
+	ASSERT(idxVersion >= 0 && idxVersion <= INDEX_CURRENT_VERSION);
 	START_RECORD(srlIndexDelete, "SRLIndexDelete::append");
 	putInt(dbb->tableSpaceId);
 	putInt(indexId);
@@ -70,7 +70,6 @@ void SRLIndexDelete::read()
 	recordId = getInt();
 	length = getInt();
 	data = getData(length);
-	ASSERT(indexVersion <= INDEX_CURRENT_VERSION);
 }
 
 
diff -Nrup a/storage/falcon/SRLRecordLocator.cpp b/storage/falcon/SRLRecordLocator.cpp
--- a/storage/falcon/SRLRecordLocator.cpp	2007-10-25 14:10:20 -04:00
+++ b/storage/falcon/SRLRecordLocator.cpp	2007-11-01 12:50:16 -04:00
@@ -41,7 +41,7 @@ SRLRecordLocator::~SRLRecordLocator()
 
 void SRLRecordLocator::append(Dbb *dbb, TransId transId, int id, int seq, int32 page)
 {
-	START_RECORD(srlSectionIndex, "SRLRecordLocator::append");
+	START_RECORD(srlRecordLocator, "SRLRecordLocator::append");
 
 	if (transId)
 		{
diff -Nrup a/storage/falcon/SRLUpdateBlob.cpp b/storage/falcon/SRLUpdateBlob.cpp
--- a/storage/falcon/SRLUpdateBlob.cpp	2007-10-16 15:40:08 -04:00
+++ b/storage/falcon/SRLUpdateBlob.cpp	2007-11-01 12:50:17 -04:00
@@ -30,7 +30,7 @@ SRLUpdateBlob::~SRLUpdateBlob(void)
 
 void SRLUpdateBlob::append(Dbb *dbb, int32 sectionId, TransId transId, int recordNumber, Stream* stream)
 {
-	START_RECORD(srlIndexDelete, "SRLIndexDelete::append");
+	START_RECORD(srlUpdateBlob, "SRLUpdateBlob::append");
 	putInt(dbb->tableSpaceId);
 	putInt(sectionId);
 	putInt(transId);
diff -Nrup a/storage/falcon/SerialLogControl.cpp b/storage/falcon/SerialLogControl.cpp
--- a/storage/falcon/SerialLogControl.cpp	2007-10-25 14:10:22 -04:00
+++ b/storage/falcon/SerialLogControl.cpp	2007-11-01 12:50:17 -04:00
@@ -109,7 +109,7 @@ SerialLogRecord* SerialLogControl::getRe
 		case srlFreePage:
 			return &freePage;
 
-		case srlSectionIndex:
+		case srlRecordLocator:
 			return &recordLocator;
 
 		case srlDataPage:
diff -Nrup a/storage/falcon/SerialLogRecord.h b/storage/falcon/SerialLogRecord.h
--- a/storage/falcon/SerialLogRecord.h	2007-10-25 14:10:23 -04:00
+++ b/storage/falcon/SerialLogRecord.h	2007-11-01 12:50:17 -04:00
@@ -50,7 +50,7 @@ static const int srlDropTable		= 13;
 static const int srlCreateSection	= 14;
 static const int srlSectionPage		= 15;
 static const int srlFreePage		= 16;
-static const int srlSectionIndex	= 17;
+static const int srlRecordLocator	= 17;
 static const int srlDataPage		= 18;
 static const int srlIndexAdd		= 19;
 static const int srlIndexDelete		= 20;