bk commit into 6.0 tree (jas:1.2676)

[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-24 15:31:59-04:00, jas@rowvwade. +4 -0
  Force flush of default table space during table space
  creation.

  storage/falcon/PageInventoryPage.cpp@stripped, 2007-10-24 15:31:51-04:00, jas@rowvwade. +12 -11
    Report section id's on orphan page reports during
    validation.

  storage/falcon/SRLCreateSection.cpp@stripped, 2007-10-24 15:31:51-04:00, jas@rowvwade. +1 -1
    Standardize recovering logging message.

  storage/falcon/SRLSequence.cpp@stripped, 2007-10-24 15:31:51-04:00, jas@rowvwade. +1 -1
    Standardize recovering logging message.

  storage/falcon/TableSpaceManager.cpp@stripped, 2007-10-24 15:31:52-04:00, jas@rowvwade. +1 -0
    Force flush of default table space during table space
    creation.

diff -Nrup a/storage/falcon/PageInventoryPage.cpp b/storage/falcon/PageInventoryPage.cpp
--- a/storage/falcon/PageInventoryPage.cpp	2007-10-24 13:45:53 -04:00
+++ b/storage/falcon/PageInventoryPage.cpp	2007-10-24 15:31:51 -04:00
@@ -219,6 +219,7 @@ void PageInventoryPage::validateInventor
 	int lastSlot = lastPage / PIP_BITS;
 	int lastBit = MASK (lastPage % PIP_BITS);
 	Bitmap *usedPages = &validation->pages;
+	int tableSpaceId = dbb->tableSpaceId;
 
 	for (int32 pageNumber = PIP_PAGE, sequence = 0; pageNumber; ++sequence)
 		{
@@ -262,8 +263,8 @@ void PageInventoryPage::validateInventor
 							switch (page->pageType)
 								{
 								case PAGE_record_locator:
-									validation->error ("orphan section index page %d, section %d, seq %d", 
-													pageNumber, 
+									validation->error ("orphan section index page %d/%d, section %d, seq %d", 
+													pageNumber, tableSpaceId,
 													((RecordLocatorPage*) page)->section,
 													((RecordLocatorPage*) page)->sequence);
 									break;
@@ -271,8 +272,8 @@ void PageInventoryPage::validateInventor
 								case PAGE_btree:
 									{
 									IndexPage *ipg = (IndexPage*) page;
-									validation->error ("orphan index page %d, level %d, parent %d, prior %d, next %d", 
-													pageNumber, 
+									validation->error ("orphan index page %d/%d, level %d, parent %d, prior %d, next %d", 
+													pageNumber,  tableSpaceId,
 													ipg->level, 
 													ipg->parentPage, 
 													ipg->priorPage, 
@@ -283,22 +284,22 @@ void PageInventoryPage::validateInventor
 								case PAGE_data:
 									{
 									DataPage *pg = (DataPage*) page;
-									validation->error ("orphan data page %d, maxLine %d", pageNumber, pg->maxLine);
+									validation->error ("orphan data page %d/%d, maxLine %d", pageNumber,  tableSpaceId, pg->maxLine);
 									}
 									break;
 
 								case PAGE_data_overflow:
 									{
 									DataOverflowPage *pg = (DataOverflowPage*) page;
-									validation->error ("orphan data overflow page %d, section=%d, next=%d", pageNumber, pg->section, pg->nextPage);
+									validation->error ("orphan data overflow page %d/%d, section=%d, next=%d", pageNumber,  tableSpaceId, pg->section, pg->nextPage);
 									}
 									break;
 
 								case PAGE_sections:
 									{
 									SectionPage *pg = (SectionPage*) page;
-									validation->error ("orphan section page %d, section=%d, seq=%d, level=%d, flgs=%d", 
-														pageNumber, pg->section, pg->level, pg->flags);
+									validation->error ("orphan section page %d/%d, section=%d, seq=%d, level=%d, flgs=%d", 
+														pageNumber, tableSpaceId, pg->section, pg->level, pg->flags);
 									}
 									break;
 
@@ -307,12 +308,12 @@ void PageInventoryPage::validateInventor
 									break;
 
 								default:
-									validation->error ("orphan page %d, type %d", 
-													pageNumber, page->pageType);
+									validation->error ("orphan page %d/%d, type %d", 
+													pageNumber, tableSpaceId, page->pageType);
 								}
 							}
 						else
-							validation->error("possible unwritten orphan page %d", pageNumber);
+							validation->error("possible unwritten orphan page %d/%d", pageNumber, tableSpaceId);
 							
 						if (validation->isRepair())
 							{
diff -Nrup a/storage/falcon/SRLCreateSection.cpp b/storage/falcon/SRLCreateSection.cpp
--- a/storage/falcon/SRLCreateSection.cpp	2007-09-20 11:42:19 -04:00
+++ b/storage/falcon/SRLCreateSection.cpp	2007-10-24 15:31:51 -04:00
@@ -89,5 +89,5 @@ void SRLCreateSection::redo()
 
 void SRLCreateSection::print(void)
 {
-	Log::debug("Serial Log Create Section %d\n", sectionId);
+	logPrint("Create Section %d/%d\n", sectionId, tableSpaceId);
 }
diff -Nrup a/storage/falcon/SRLSequence.cpp b/storage/falcon/SRLSequence.cpp
--- a/storage/falcon/SRLSequence.cpp	2007-09-20 11:42:25 -04:00
+++ b/storage/falcon/SRLSequence.cpp	2007-10-24 15:31:51 -04:00
@@ -61,5 +61,5 @@ void SRLSequence::redo()
 
 void SRLSequence::print(void)
 {
-	Log::debug("Serial Log Sequence id %d, value " I64FORMAT "\n", sequenceId, sequence);
+	logPrint("Sequence id %d, value " I64FORMAT "\n", sequenceId, sequence);
 }
diff -Nrup a/storage/falcon/TableSpaceManager.cpp b/storage/falcon/TableSpaceManager.cpp
--- a/storage/falcon/TableSpaceManager.cpp	2007-10-10 03:13:26 -04:00
+++ b/storage/falcon/TableSpaceManager.cpp	2007-10-24 15:31:52 -04:00
@@ -178,6 +178,7 @@ TableSpace* TableSpaceManager::createTab
 		throw;
 		}
 
+	database->dbb->flush();
 	database->serialLog->logControl->createTableSpace.append(tableSpace);
 	
 	return tableSpace;