List:Commits« Previous MessageNext Message »
From:Jonas Oreland Date:September 27 2010 8:50am
Subject:bzr commit into mysql-5.1-telco-6.3 branch (jonas:3306)
View as plain text  
#At file:///home/jonas/src/telco-6.3/ based on revid:pekka@stripped

 3306 Jonas Oreland	2010-09-27
      ndb - bug-56961 fix bug in bugfix found by autotest

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-09-23 07:30:29 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2010-09-27 08:50:20 +0000
@@ -16875,8 +16875,18 @@ void Dblqh::readFileInInvalidate(Signal*
              logPartPtr.i, logFilePtr.p->fileNo, stepNext);
   }
 
+  if (stepNext == 0)
+  {
+    jam();
+    // Contact NDBFS. Real time break.
+    readSinglePage(signal, logPartPtr.p->invalidatePageNo);
+    lfoPtr.p->lfoState = LogFileOperationRecord::READ_SR_INVALIDATE_PAGES;
+    return;
+  }
+
   if (stepNext == 1)
   {
+    jam();
     logPartPtr.p->invalidatePageNo++;
     if (logPartPtr.p->invalidatePageNo == (clogFileSize * ZPAGES_IN_MBYTE))
     {


Attachment: [text/bzr-bundle] bzr/jonas@mysql.com-20100927085020-c90j1wgyevuqoud9.bundle
Thread
bzr commit into mysql-5.1-telco-6.3 branch (jonas:3306) Jonas Oreland27 Sep