bk commit into 4.1 tree (jonas:1.2460) BUG#13965

[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.2460 06/02/06 11:30:56 jonas@stripped +1 -0
  bug#13965
    ndb - error while restarting in dict
          improve error message when changed config leads to failed restart

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.44 06/02/06 11:30:55 jonas@stripped +13 -1
    improve error message

# 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.43/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-12-02 09:27:03 +01:00
+++ 1.44/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-02-06 11:30:55 +01:00
@@ -2397,7 +2397,19 @@
   Uint32 sz = c_readTableRecord.noOfPages * ZSIZE_OF_PAGES_IN_WORDS; 
   SimplePropertiesLinearReader r(&pageRecPtr.p->word[0], sz);
   handleTabInfoInit(r, &parseRecord);
-  ndbrequire(parseRecord.errorCode == 0);
+  if (parseRecord.errorCode != 0)
+  {
+    char buf[255];
+    BaseString::snprintf(buf, sizeof(buf), 
+			 "Unable to restart, fail while creating table %d"
+			 " error: %d. Most likely change of configution",
+			 c_readTableRecord.tableId,
+			 parseRecord.errorCode);
+    progError(__LINE__, 
+	      ERR_INVALID_CONFIG,
+	      buf);
+    ndbrequire(parseRecord.errorCode == 0);
+  }
   
   /* ---------------------------------------------------------------- */
   // We have read the table description from disk as part of system restart.