From: Date: February 16 2006 2:29pm
Subject: bk commit into 5.1 tree (tomas:1.1986) BUG#17295
List-Archive: http://lists.mysql.com/commits/2724
X-Bug: 17295
Message-Id: <20060216132907.0E812814D4@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.1986 06/02/16 14:28:57 tomas@stripped +1 -0
  bug#17295

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.82 06/02/16 14:28:49 tomas@stripped +11 -3
    bug#17295

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/wl2325-alcatel

--- 1.81/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-01-02 15:27:34 +01:00
+++ 1.82/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-02-16 14:28:49 +01:00
@@ -14823,7 +14823,9 @@
           signal->theData[4] = logFilePtr.p->currentFilepage;
           signal->theData[5] = logFilePtr.p->currentMbyte;
           signal->theData[6] = logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX];
-          sendSignal(cownref, GSN_DEBUG_SIG, signal, 7, JBA);
+	  signal->theData[7] = ~0;
+	  signal->theData[8] = __LINE__;
+          sendSignal(cownref, GSN_DEBUG_SIG, signal, 9, JBA);
           return;
         }//if
       }//if
@@ -14889,7 +14891,8 @@
       signal->theData[5] = logFilePtr.p->currentFilepage;
       signal->theData[6] = logPagePtr.p->logPageWord[ZCURR_PAGE_INDEX];
       signal->theData[7] = logWord;
-      sendSignal(cownref, GSN_DEBUG_SIG, signal, 8, JBA);
+      signal->theData[8] = __LINE__;
+      sendSignal(cownref, GSN_DEBUG_SIG, signal, 9, JBA);
       return;
       break;
     }//switch
@@ -14918,8 +14921,9 @@
 
   char buf[100];
   BaseString::snprintf(buf, 100, 
-	   "Error while reading REDO log.\n"
+	   "Error while reading REDO log. from %d\n"
 	   "D=%d, F=%d Mb=%d FP=%d W1=%d W2=%d",
+	   signal->theData[8],
 	   signal->theData[2], signal->theData[3], signal->theData[4],
 	   signal->theData[5], signal->theData[6], signal->theData[7]);
 
@@ -15495,6 +15499,10 @@
   // to read a page from file. 
   lfoPtr.p->lfoState = LogFileOperationRecord::WRITE_SR_INVALIDATE_PAGES;
 
+  /**
+   * Make sure we dont release zero page
+   */
+  seizeLogpage(signal);
   invalidateLogAfterLastGCI(signal);
   return;
 }//Dblqh::readSrFourthZeroLab()