Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp

@@ -305,6 +305,11 @@ Dblqh::Dblqh(Block_context& ctx):
   
   initData();
 
+  /* maximum number of log file operations */
+  clfoFileSize = clogPageFileSize;
+  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
+    clfoFileSize = ZLFO_MIN_FILE_SIZE;
+
 #ifdef VM_TRACE
   {
     void* tmp[] = { 

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

@@ -8006,11 +8006,6 @@ void Dblqh::continueScanNextReqLab(Signal* signal)
     return;
   }
 
-  /* maximum number of log file operations */
-  clfoFileSize = clogPageFileSize;
-  if (clfoFileSize < ZLFO_MIN_FILE_SIZE)
-    clfoFileSize = ZLFO_MIN_FILE_SIZE;
-
   // Update timer on tcConnectRecord
   tcConnectptr.p->tcTimer = cLqhTimeOutCount;
   init_acc_ptr_list(scanptr.p);