Merge perch.ndb.mysql.com:/home/jonas/src/50-work

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

2 files changed, 15 insertions, 8 deletions

diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 491aa0849b9..03731b60fe5 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -8252,11 +8252,20 @@ void Dbdih::openingTableErrorLab(Signal* signal, FileRecordPtr filePtr)
   /*    WE FAILED IN OPENING A FILE. IF THE FIRST FILE THEN TRY WITH THE    */
   /*    DUPLICATE FILE, OTHERWISE WE REPORT AN ERROR IN THE SYSTEM RESTART. */
   /* ---------------------------------------------------------------------- */
-  ndbrequire(filePtr.i == tabPtr.p->tabFile[0]);
-  filePtr.i = tabPtr.p->tabFile[1];
-  ptrCheckGuard(filePtr, cfileFileSize, fileRecord);
-  openFileRw(signal, filePtr);
-  filePtr.p->reqStatus = FileRecord::OPENING_TABLE;
+  if (filePtr.i == tabPtr.p->tabFile[0])
+  {
+    filePtr.i = tabPtr.p->tabFile[1];
+    ptrCheckGuard(filePtr, cfileFileSize, fileRecord);
+    openFileRw(signal, filePtr);
+    filePtr.p->reqStatus = FileRecord::OPENING_TABLE;
+  }
+  else
+  {
+    char buf[256];
+    BaseString::snprintf(buf, "Error opening DIH schema files for table: %d",
+			 tabPtr.i);
+    progError(__LINE__, NDBD_EXIT_AFS_NO_SUCH_FILE, buf);
+  }
 }//Dbdih::openingTableErrorLab()
 
 void Dbdih::readingTableLab(Signal* signal, FileRecordPtr filePtr) 
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 0ea49e47fc7..87f2849aebc 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -12579,19 +12579,17 @@ void Dblqh::lastWriteInFileLab(Signal* signal)
 
 void Dblqh::writePageZeroLab(Signal* signal) 
 {
-  if (false && logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 
+  if (logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM) 
   {
     if (logPartPtr.p->firstLogQueue == RNIL) 
     {
       jam();
       logPartPtr.p->logPartState = LogPartRecord::IDLE;
-      ndbout_c("resetting logPartState to IDLE");
     } 
     else 
     {
       jam();
       logPartPtr.p->logPartState = LogPartRecord::ACTIVE;
-      ndbout_c("resetting logPartState to ACTIVE");
     }
   }