bk commit into 5.0 tree (jonas:1.2133) BUG#20860

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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
  1.2133 06/07/06 15:51:35 jonas@stripped +1 -0
  ndb - bug#20860
    Better error message when failing to read either of 2 DIH schema files

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.50 06/07/06 15:51:32 jonas@stripped +14 -5
    Better error message when failing to read either of 2 DIH schema files

# 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/50-work

--- 1.49/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-06-01 08:28:55 +02:00
+++ 1.50/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-07-06 15:51:32 +02:00
@@ -8209,11 +8209,20 @@ void Dbdih::openingTableErrorLab(Signal*
   /*    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)