bk commit into 5.1 tree (jonas:1.2249)

[jonas]

Below is the list of changes that have just been committed into a local
5.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-08-01 16:27:17+02:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/51-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
  MERGE: 1.2181.104.4

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2006-08-01 16:27:14+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.66.1.5

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2006-08-01 16:27:14+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.115.1.2

  storage/ndb/src/ndbapi/NdbScanOperation.cpp@stripped, 2006-08-01 16:27:14+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.86.1.1

# 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/mysql-5.1-new/RESYNC

--- 1.74/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-08-01 16:27:21 +02:00
+++ 1.75/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2006-08-01 16:27:21 +02:00
@@ -8533,11 +8533,20 @@
   /*    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) 

--- 1.116/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-08-01 16:27:21 +02:00
+++ 1.117/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-08-01 16:27:21 +02:00
@@ -498,6 +498,7 @@
   csignalKey = signal->theData[6];
 #if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
   char *name;
+  FILE *out = 0;
 #endif
   switch (tstartPhase) {
   case ZSTART_PHASE1:
@@ -509,8 +510,14 @@
     sendsttorryLab(signal);
     
 #if defined VM_TRACE || defined ERROR_INSERT || defined NDBD_TRACENR
-    name = NdbConfig_SignalLogFileName(getOwnNodeId());
-    tracenrout = new NdbOut(* new FileOutputStream(fopen(name, "w+")));
+#ifdef VM_TRACE
+    out = globalSignalLoggers.getOutputStream();
+#endif
+    if (out == 0) {
+      name = NdbConfig_SignalLogFileName(getOwnNodeId());
+      out = fopen(name, "a");
+    }
+    tracenrout = new NdbOut(* new FileOutputStream(out));
 #endif
 
 #ifdef ERROR_INSERT