bk commit into 6.0 tree (jas:1.2666)

[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-10-31 10:50:37-04:00, jas@rowvwade. +1 -0
  Add backwards compatibility for some assertions.

  storage/falcon/Section.cpp@stripped, 2007-10-31 10:50:30-04:00, jas@rowvwade. +4 -4
    Add backwards compatibility for some assertions.

diff -Nrup a/storage/falcon/Section.cpp b/storage/falcon/Section.cpp
--- a/storage/falcon/Section.cpp	2007-10-25 14:10:21 -04:00
+++ b/storage/falcon/Section.cpp	2007-10-31 10:50:30 -04:00
@@ -512,7 +512,7 @@ void Section::updateRecord(int32 recordN
 
 	bdb->mark(transId);
 	RecordLocatorPage *locatorPage = (RecordLocatorPage*) bdb->buffer;
-	ASSERT(locatorPage->section == sectionId);
+	ASSERT(locatorPage->section == sectionId || locatorPage->section == 0);
 	int line = recordNumber % dbb->linesPerPage;
 	RecordIndex *index = locatorPage->elements + line;
 
@@ -586,7 +586,7 @@ Bdb* Section::fetchLocatorPage(int32 roo
 
 	bdb = dbb->handoffPage (bdb, pageNumber, PAGE_record_locator, lockType);
 	RecordLocatorPage *locatorPage = (RecordLocatorPage*) bdb->buffer;
-	ASSERT(locatorPage->section == sectionId);
+	ASSERT(locatorPage->section == sectionId || locatorPage->section == 0);
 	BDB_HISTORY(bdb);
 	
 	return bdb;
@@ -813,7 +813,7 @@ int32 Section::findNextRecord(int32 page
 
 	if (locatorPage->pageType == PAGE_record_locator)
 		{
-		ASSERT(locatorPage->section == sectionId);
+		ASSERT(locatorPage->section == sectionId || locatorPage->section == 0);
 		
 		for (int slot = startingRecord % dbb->linesPerPage; slot < locatorPage->maxLine; ++slot)
 			if (locatorPage->elements [slot].page)
@@ -1241,7 +1241,7 @@ void Section::redoRecordLocatorPage(int 
 			if (locatorBdb)
 				{
 				RecordLocatorPage *locatorPage = (RecordLocatorPage*) locatorBdb->buffer;
-				ASSERT(locatorPage->section == sectionId);
+				ASSERT(locatorPage->section == sectionId || locatorPage->section == 0);
 				
 				if (locatorPage->section != sectionId || locatorPage->sequence != sequence)
 					rebuild = true;