bk commit into 5.0 tree (jonas:1.1983)

[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.1983 06/02/10 10:10:52 jonas@stripped +2 -0
  merge

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.80 06/02/10 10:10:49 jonas@stripped +1 -1
    merge

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.61 06/02/10 10:10:49 jonas@stripped +1 -1
    merge

# 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.60/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-02-06 11:46:37 +01:00
+++ 1.61/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-02-10 10:10:49 +01:00
@@ -2584,7 +2584,7 @@
 			 c_readTableRecord.tableId,
 			 parseRecord.errorCode);
     progError(__LINE__, 
-	      ERR_INVALID_CONFIG,
+	      NDBD_EXIT_INVALID_CONFIG,
 	      buf);
     ndbrequire(parseRecord.errorCode == 0);
   }

--- 1.79/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-02-10 09:18:46 +01:00
+++ 1.80/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-02-10 10:10:49 +01:00
@@ -16176,7 +16176,7 @@
 		       "Unable to restart, failed while reading redo."
 		       " Likely invalid change of configuration");
   progError(__LINE__, 
-	    ERR_INVALID_CONFIG,
+	    NDBD_EXIT_INVALID_CONFIG,
 	    buf);
 }//Dblqh::findLogfile()