bk commit into 4.1 tree (jonas:1.2461) BUG#13966

[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
  1.2461 06/02/06 11:42:44 jonas@stripped +2 -0
  bug#13966 - ndb
    better error message on invalid config change

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.60 06/02/06 11:42:43 jonas@stripped +14 -0
    Change error message...note that this is a guess

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.45 06/02/06 11:42:43 jonas@stripped +1 -1
    fix typo

# 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.44/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-02-06 11:30:55 +01:00
+++ 1.45/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-02-06 11:42:43 +01:00
@@ -2402,7 +2402,7 @@
     char buf[255];
     BaseString::snprintf(buf, sizeof(buf), 
 			 "Unable to restart, fail while creating table %d"
-			 " error: %d. Most likely change of configution",
+			 " error: %d. Most likely change of configuration",
 			 c_readTableRecord.tableId,
 			 parseRecord.errorCode);
     progError(__LINE__, 

--- 1.59/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-12-21 16:31:56 +01:00
+++ 1.60/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-02-06 11:42:43 +01:00
@@ -16096,8 +16096,22 @@
     }//if
     locLogFilePtr.i = locLogFilePtr.p->nextLogFile;
     loopCount++;
+    if (loopCount >= flfLogPartPtr.p->noLogFiles &&
+	getNodeState().startLevel != NodeState::SL_STARTED)
+    {
+      goto error;
+    }
     ndbrequire(loopCount < flfLogPartPtr.p->noLogFiles);
   }//while
+
+error:
+  char buf[255];
+  BaseString::snprintf(buf, sizeof(buf), 
+		       "Unable to restart, failed while reading redo."
+		       " Likely invalid change of configuration");
+  progError(__LINE__, 
+	    ERR_INVALID_CONFIG,
+	    buf);
 }//Dblqh::findLogfile()
 
 /* ------------------------------------------------------------------------- */