bzr commit into mysql-6.0-falcon-team branch (kevin.lewis:2775) Bug#46975

[Kevin Lewis]

#At file:///C:/Work/bzr/Merge/mysql-6.0-falcon-team/ based on revid:kevin.lewis@stripped

 2775 Kevin Lewis	2009-08-28
      Bug#46975 - SerialLog::findWindowGivenOffset() is expected by its callers to return NULL if the virtualOffset is not within the current portion of the serial log.  But instead, it asserts that the woindow could not be read.  This assert needs to be deleted.
      
      In addition, if this happens for a deferredIndex, SRLUpdateIndex::thaw() should issue a FATAL message instead of continuing with an unthawed index.

    modified:
      storage/falcon/SRLUpdateIndex.cpp
      storage/falcon/SerialLog.cpp
=== modified file 'storage/falcon/SRLUpdateIndex.cpp'
--- a/storage/falcon/SRLUpdateIndex.cpp	2009-04-02 22:36:19 +0000
+++ b/storage/falcon/SRLUpdateIndex.cpp	2009-08-28 17:09:54 +0000
@@ -246,7 +246,7 @@ void SRLUpdateIndex::thaw(DeferredIndex*
 		{
 		Log::log("Index thaw FAIL: A window for DeferredIndex::virtualOffset=" I64FORMAT " could not be found.\n", deferredIndex->virtualOffset);
 		log->printWindows();
-		return;
+		FATAL("Index thaw FAIL: A window for DeferredIndex::virtualOffset=" I64FORMAT " could not be found.\n", deferredIndex->virtualOffset);
 		}
 
 	// Location of the DeferredIndex within the window

=== modified file 'storage/falcon/SerialLog.cpp'
--- a/storage/falcon/SerialLog.cpp	2009-06-10 07:36:02 +0000
+++ b/storage/falcon/SerialLog.cpp	2009-08-28 17:09:54 +0000
@@ -942,10 +942,6 @@ SerialLogWindow* SerialLog::findWindowGi
 			return window;
 			}
 
-	Log::debug("SerialLog::findWindowGivenOffset -- can't find window\n");
-	printWindows();
-	ASSERT(false);
-
 	return NULL;
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]