bk commit into 6.0-falcon tree (jas:1.2617)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon 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-07-09 20:13:57-04:00, jas@rowvwade. +3 -0
  Partial fix of drop table blob section crash.

  storage/falcon/DataPage.cpp@stripped, 2007-07-09 20:13:42-04:00, jas@rowvwade. +1 -1
    Be a little more conservative about space return.

  storage/falcon/Dbb.cpp@stripped, 2007-07-09 20:13:43-04:00, jas@rowvwade. +4 -1
    Don't try to validate table space inversions (there aren't any).

  storage/falcon/RecordLocatorPage.cpp@stripped, 2007-07-09 20:13:43-04:00, jas@rowvwade. +35
-8
    Fix data section deletion code to handle multiple data page
    per locator page.  Also beefed up database validation.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.5/storage/falcon/RecordLocatorPage.cpp	2007-07-09 20:14:20 -04:00
+++ 1.6/storage/falcon/RecordLocatorPage.cpp	2007-07-09 20:14:20 -04:00
@@ -78,28 +78,38 @@
 		if (!index->page && index->line)
 			{
 			if (validation->minutia())
-				validation->error ("Abandoned list slot, section %d, sequence %d, line %d",
+				validation->error("Abandoned list slot, section %d, sequence %d, line %d",
 								   sectionId, sequence, n);
 			ok = false;
 			}
 			
-		if (index->page && !dataPages->isSet (index->page))
+		if (index->page)
 			{
-			dataPages->set (index->page);
-			Bdb *bdb = dbb->fetchPage (index->page, PAGE_any, Shared);
+			Bdb *bdb = dbb->fetchPage(index->page, PAGE_any, Shared);
 			
-			if (validation->isPageType (bdb, PAGE_data, "DataPage, section %d, sequence %d",
sectionId, sequence))
+			if (validation->isPageType(bdb, PAGE_data, "DataPage, section %d, sequence %d",
sectionId, sequence))
 				{
-				validation->inUse (index->page, "data page");
 				DataPage *dataPage = (DataPage*) bdb->buffer;
-				dataPage->validate (dbb, validation);
+
+				if (!dataPages->isSet(index->page))
+					{
+					validation->inUse(index->page, "data page");
+					dataPage->validate(dbb, validation);
+					}
+				
+				if (index->line >= dataPage->maxLine)
+					validation->error("Missing data record, section %d, sequence %d, line %d, data
page %d",
+									  sectionId, sequence, n, bdb->pageNumber);
 				}
 			else
 				{
 				ok = false;
-				validation->inUse (index->page, "data page (bad)");
+				
+				if (!dataPages->isSet(index->page))
+					validation->inUse(index->page, "data page (bad)");
 				}
 				
+			dataPages->set(index->page);
 			bdb->release();
 			}
 		}
@@ -408,9 +418,26 @@
 
 void RecordLocatorPage::deleteDataPages(Dbb* dbb, TransId transId)
 {
+	/***
 	for (int slot = -1; (slot = nextSpaceSlot(slot)) >= 0;)
 		{
 		int32 pageNumber = elements[slot].page;
+		
+		if (pageNumber == 149)
+			printf("page %d\n", pageNumber);
+			
+		Bdb *bdb = dbb->fetchPage(pageNumber, PAGE_data, Exclusive);
+		bdb->mark(transId);
+		DataPage *dataPage = (DataPage*) bdb->buffer;
+		dataPage->deletePage(dbb, transId);
+		dbb->freePage(bdb, transId);
+		}
+	***/
+	
+	for (int slot; (slot = nextSpaceSlot(-1)) >= 0;)
+		{
+		int pageNumber = elements[slot].page;
+		expungeDataPage(pageNumber);
 		Bdb *bdb = dbb->fetchPage(pageNumber, PAGE_data, Exclusive);
 		bdb->mark(transId);
 		DataPage *dataPage = (DataPage*) bdb->buffer;

--- 1.25/storage/falcon/DataPage.cpp	2007-07-09 20:14:20 -04:00
+++ 1.26/storage/falcon/DataPage.cpp	2007-07-09 20:14:20 -04:00
@@ -322,7 +322,7 @@
 	maxLine = max;
 	available -= maxLine * sizeof(lineIndex);
 	
-	if (available == 0)
+	if (available <= 0)
 		available = 1;
 		
 	return (maxLine > 0) ? available : 0;

--- 1.79/storage/falcon/Dbb.cpp	2007-07-09 20:14:20 -04:00
+++ 1.80/storage/falcon/Dbb.cpp	2007-07-09 20:14:20 -04:00
@@ -648,7 +648,10 @@
 		validation.phase = 1;
 		validation.inUse ((int32) HEADER_PAGE, "HeaderPage");
 		PageInventoryPage::validate (this, &validation);
-		inversion->validate (&validation);
+		
+		if (inversion)
+			inversion->validate (&validation);
+			
 		Section::validateIndexes (this, &validation);
 		Section::validateSections (this, &validation);
 		}