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

[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-18 18:50:02-04:00, jas@rowvwade. +2 -0
  Replace assertion with logged anomoly message when a page
  page danging reference into an empty data page.

  storage/falcon/RecordVersion.cpp@stripped, 2007-07-18 18:49:53-04:00, jas@rowvwade. +5 -3
    Avoid disappearing transaction pointer syndrome.

  storage/falcon/Section.cpp@stripped, 2007-07-18 18:49:53-04:00, jas@rowvwade. +8 -3
    Replace assertion with logged anomoly message when a page
    page danging reference into an empty data page.

# 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.47/storage/falcon/RecordVersion.cpp	2007-07-18 18:50:25 -04:00
+++ 1.48/storage/falcon/RecordVersion.cpp	2007-07-18 18:50:25 -04:00
@@ -85,18 +85,20 @@
 Record* RecordVersion::fetchVersion(Transaction * trans)
 {
 	// Unless the record is at least as old as the transaction, it's not for us
+
+	Transaction *recTransaction = transaction;
 	
 	if (state != recLock)
 		{
 		if (trans->isolationLevel == TRANSACTION_READ_COMMITTED)
 			{
-			if (!transaction || transaction->state == Committed || transaction == trans)
+			if (!recTransaction || recTransaction->state == Committed || recTransaction == trans)
 				return (getRecordData()) ? this : NULL;
 			}
 		// else TRANSACTION_REPEATABLE_READ OR TRANSACTION_WRITE_COMMITTED
 		else if (transactionId <= trans->transactionId)
 			{
-			if (trans->visible (transaction))
+			if (trans->visible(recTransaction))
 				return (getRecordData()) ? this : NULL;
 			}
 		}
@@ -104,7 +106,7 @@
 	if (!priorVersion)
 		return NULL;
 		
-	return priorVersion->fetchVersion (trans);
+	return priorVersion->fetchVersion(trans);
 }
 
 Record* RecordVersion::rollback()

--- 1.60/storage/falcon/Section.cpp	2007-07-18 18:50:25 -04:00
+++ 1.61/storage/falcon/Section.cpp	2007-07-18 18:50:25 -04:00
@@ -550,15 +550,20 @@
 	
 	if (page->maxLine > 0)
 		{
-		//dbb->setPrecedence(bdb, sectionPageNumber);
 		bdb->release();
 		
 		return spaceAvailable;
 		}
 
-	for (int n = 0; n <= locatorPage->maxLine; ++n)
+	for (int n = 0; n < locatorPage->maxLine; ++n)
 		if (n != locatorLine && locatorPage->elements[n].page == bdb->pageNumber)
-			ASSERT(false);
+			{
+			//ASSERT(false);
+			Log::debug("Section::deleteLine -- locator page %d line %d points to empty data page %d:%d\n",
+						sectionPageNumber, n, locatorPage->elements[n].page, locatorPage->elements[n].line);
+					
+			return spaceAvailable;
+			}
 	
 	if (!dbb->serialLog->recovering)
 		dbb->serialLog->logControl->sectionLine.append(dbb, sectionPageNumber, bdb->pageNumber);