bk commit into 4.1 tree (jonas:1.2513) BUG#20904

[jonas]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas 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, 2006-07-07 16:01:35+02:00, jonas@stripped +1 -0
  ndb - bug#20904
    Reset logpartstate if file_change_problem after writeing of zero page is done

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2006-07-07 16:01:30+02:00,
jonas@stripped +14 -0
    ndb - bug#20904
      Reset logpartstate if file_change_problem after writeing of zero page is done

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/41-work

--- 1.63/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-07-07 16:01:42 +02:00
+++ 1.64/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-07-07 16:01:42 +02:00
@@ -12508,6 +12508,20 @@
 
 void Dblqh::writePageZeroLab(Signal* signal) 
 {
+  if (logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 
+  {
+    if (logPartPtr.p->firstLogQueue == RNIL) 
+    {
+      jam();
+      logPartPtr.p->logPartState = LogPartRecord::IDLE;
+    } 
+    else 
+    {
+      jam();
+      logPartPtr.p->logPartState = LogPartRecord::ACTIVE;
+    }
+  }
+  
   logFilePtr.p->fileChangeState = LogFileRecord::NOT_ONGOING;
 /*---------------------------------------------------------------------------*/
 /* IT COULD HAVE ARRIVED PAGE WRITES TO THE CURRENT FILE WHILE WE WERE       */