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

[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-08 19:41:09-04:00, jas@rowvwade. +2 -0
  Don't bugcheck on funny free space calculation -- just log it
  and return 0.

  storage/falcon/DataPage.cpp@stripped, 2007-07-08 19:40:58-04:00, jas@rowvwade. +10 -1
    Don't bugcheck on funny free space calculation -- just log it
    and return 0.

  storage/falcon/Index.cpp@stripped, 2007-07-08 19:40:59-04:00, jas@rowvwade. +2 -0
    Stop logging failed index cleanup until Win32 logging
    hangup is resolved.

# 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.23/storage/falcon/DataPage.cpp	2007-07-08 19:41:31 -04:00
+++ 1.24/storage/falcon/DataPage.cpp	2007-07-08 19:41:31 -04:00
@@ -419,7 +419,16 @@
 		if (lineIndex[n].offset)
 			spaceUsed += ABS(lineIndex[n].length);
 	
-	return pageSize - maxLine * sizeof(LineIndex) - spaceUsed;
+	int space = pageSize - maxLine * sizeof(LineIndex) - spaceUsed;
+	
+	if (space < 0)
+		{
+		Log::debug("DataPage::computeSpaceAvailable got a negative number\n");
+		
+		return 0;
+		}
+	
+	return space;
 }
 
 void DataPage::deletePage(Dbb *dbb, TransId transId)

--- 1.56/storage/falcon/Index.cpp	2007-07-08 19:41:31 -04:00
+++ 1.57/storage/falcon/Index.cpp	2007-07-08 19:41:31 -04:00
@@ -564,8 +564,10 @@
 				
 				if (!hit && !quiet)
 					{
+					/***
 					Log::log("Index deletion failed for record %d.%d of %s.%s.%s\n", 
 							 record->recordNumber, n, table->schemaName, table->name, (const char*) name);
+					***/
 					//int prevDebug = dbb->debug
 					//dbb->debug = DEBUG_PAGES | DEBUG_KEYS;
 					dbb->deleteIndexEntry(indexId, indexVersion, &key, record->recordNumber, TRANSACTION_ID(transaction));