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

[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-04 15:59:02-04:00, jas@rowvwade. +1 -0
  Disabled many consistency assertions used to track down
  a bug.

  storage/falcon/SerialLog.cpp@stripped, 2007-07-04 15:58:51-04:00, jas@rowvwade. +15 -29
    Commented out many, many consistency assertion if SerialLog.cpp.
    These can be deleted in the near future if the code continues
    to behave itself.

# 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.96/storage/falcon/SerialLog.cpp	2007-07-04 15:59:19 -04:00
+++ 1.97/storage/falcon/SerialLog.cpp	2007-07-04 15:59:19 -04:00
@@ -419,7 +419,6 @@
 
 void SerialLog::overflowFlush(void)
 {
-	ASSERT(syncWrite.getExclusiveThread() == Thread::getThread("SerialLog::overflowFlush"));
 	++eventNumber;		
 	++logicalFlushes;
 
@@ -430,7 +429,6 @@
 	//writeBlock->creationTime = (uint32) creationTime;
 	writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
 	writeWindow->setLastBlock(writeBlock);
-	ASSERT(writeWindow->validate(writeBlock));
 	lastReadBlock = writeBlock->readBlockNumber = getReadBlock();
 	ASSERT(writeWindow->validate(writeBlock));
 	
@@ -514,9 +512,9 @@
 	//writeBlock->blockNumber = nextBlockNumber++;
 	//writeBlock->creationTime = (uint32) creationTime;
 	writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
-	ASSERT(writeWindow->validate(writeBlock));
+	//ASSERT(writeWindow->validate(writeBlock));
 	lastReadBlock = writeBlock->readBlockNumber = getReadBlock();
-	ASSERT(writeWindow->validate(writeBlock));
+	//ASSERT(writeWindow->validate(writeBlock));
 
 	// Keep track of what needs to be written
 
@@ -527,7 +525,7 @@
 
 	if (!forceNewWindow && (writeBlock =
writeWindow->nextAvailableBlock(writeBlock)))
 		{
-		ASSERT(flushWindow->validate(flushBlock));
+		//ASSERT(flushWindow->validate(flushBlock));
 		initializeWriteBlock(writeBlock);
 		//writePtr = writeBlock->data;
 		//writeBlock->blockNumber = nextBlockNumber;
@@ -536,15 +534,15 @@
 		//writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
 		//writeWindow->currentLength = (int) (writePtr - writeWindow->buffer);
 		//writeWindow->lastBlockNumber = writeBlock->blockNumber;
-		ASSERT(writeWindow->validate(writeBlock));
-		ASSERT(flushWindow->validate(flushBlock));
+		//ASSERT(writeWindow->validate(writeBlock));
+		//ASSERT(flushWindow->validate(flushBlock));
 		}
 	else
 		{
 		flushBlock->length = (int) (writePtr - (UCHAR*) flushBlock);
-		ASSERT(flushWindow->validate(flushBlock));
+		//ASSERT(flushWindow->validate(flushBlock));
 		createNewWindow();
-		ASSERT(flushWindow->validate(flushBlock));
+		//ASSERT(flushWindow->validate(flushBlock));
 		}
 
 	// Everything is ready to go.  Release the locks and start writing
@@ -564,16 +562,16 @@
 	wakeupFlushQueue(thread);
 	ASSERT(writer != thread);
 	ASSERT(writer || !srlQueue);
-	syncPtr->unlock();
 	ASSERT(writeWindow->validate(writeBlock));
+	syncPtr->unlock();
 
 	return nextBlockNumber;
 }
 
 void SerialLog::createNewWindow(void)
 {
-	ASSERT(syncWrite.ourExclusiveLock());
-	ASSERT(!writeBlock || writeWindow->validate(writeBlock));
+	//ASSERT(syncWrite.ourExclusiveLock());
+	//ASSERT(!writeBlock || writeWindow->validate(writeBlock));
 
 	// We need a new window.  Start by purging any unused windows
 
@@ -630,8 +628,8 @@
 
 void SerialLog::putData(uint32 length, const UCHAR *data)
 {
-	ASSERT(syncWrite.ourExclusiveLock());
-	ASSERT(writeWindow->validate(writePtr));
+	//ASSERT(syncWrite.ourExclusiveLock());
+	//ASSERT(writeWindow->validate(writePtr));
 
 	if ((writePtr + length) < writeWarningTrack)
 		{
@@ -639,9 +637,9 @@
 		writePtr += length;
 		writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
 		writeWindow->currentLength = (int) (writePtr - writeWindow->buffer);
-		ASSERT(writePtr < writeWindow->warningTrack);
-		ASSERT(writeWindow->validate(writeBlock));
-		ASSERT(writeWindow->validate(writePtr));
+		//ASSERT(writePtr < writeWindow->warningTrack);
+		//ASSERT(writeWindow->validate(writeBlock));
+		//ASSERT(writeWindow->validate(writePtr));
 
 		return;
 		}
@@ -649,23 +647,14 @@
 	// Data didn't fit in block -- find out how much didn't fit, then flush the rest
 	// Note: the record code is going to be overwritten by an srlEnd byte.
 
-	SerialLogWindow *flushWindow = writeWindow;
-	SerialLogBlock *flushBlock = writeBlock;
 	int tailLength = (int) (writePtr - recordStart);
 	UCHAR recordCode = *recordStart;
 	writeBlock->length = (int) (recordStart - (UCHAR*) writeBlock);
-	ASSERT(writeWindow->validate(writeBlock));
 	writePtr = recordStart;
 	overflowFlush();
-	ASSERT(writeWindow->validate(writeBlock));
-	ASSERT(flushWindow->validate(flushBlock));
 
 	while (writePtr + length + tailLength >= writeWarningTrack)
-		{
 		overflowFlush();
-		ASSERT(writeWindow->validate(writeBlock));
-		ASSERT(flushWindow->validate(flushBlock));
-		}
 		
 	putVersion();
 
@@ -689,9 +678,7 @@
 	writeBlock->length = (int) (writePtr - (UCHAR*) writeBlock);
 	writeWindow->currentLength = (int) (writePtr - writeWindow->buffer);
 	recordStart = writeBlock->data;
-	ASSERT(writeWindow->validate(writePtr));
 	ASSERT(writeWindow->validate(writeBlock));
-	ASSERT(flushWindow->validate(flushBlock));
 }
 
 void SerialLog::startRecord()
@@ -943,7 +930,6 @@
 
 void SerialLog::initializeWriteBlock(SerialLogBlock *block)
 {
-	ASSERT(syncWrite.ourExclusiveLock());
 	writeBlock = block;
 	writePtr = writeBlock->data;
 	writeBlock->blockNumber = nextBlockNumber++;