Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  manual merge

storage/ndb/include/mgmapi/ndbd_exit_codes.h

@@ -80,6 +80,7 @@ typedef ndbd_exit_classification_enum ndbd_exit_classification;
 #define NDBD_EXIT_SR_UNDOLOG                  2313 
 #define NDBD_EXIT_SR_SCHEMAFILE               2310
 #define NDBD_EXIT_SINGLE_USER_MODE            2314 
+#define NDBD_EXIT_NODE_DECLARED_DEAD          2315 
 #define NDBD_EXIT_MEMALLOC                    2327
 #define NDBD_EXIT_BLOCK_JBUFCONGESTION        2334
 #define NDBD_EXIT_TIME_QUEUE_SHORT            2335

storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp

@@ -3052,7 +3052,7 @@ void Qmgr::failReportLab(Signal* signal, Uint16 aFailedNode,
   if (failedNodePtr.i == getOwnNodeId()) {
     jam();
 
-    Uint32 code = 0;
+    Uint32 code = NDBD_EXIT_NODE_DECLARED_DEAD;
     const char * msg = 0;
     char extra[100];
     switch(aFailCause){

storage/ndb/src/kernel/error/ndbd_exit_codes.c

@@ -57,6 +57,8 @@ static const ErrStruct errArray[] =
     "error(s) on other node(s)"},
    {NDBD_EXIT_PARTITIONED_SHUTDOWN, XAE, "Partitioned cluster detected. "
     "Please check if cluster is already running"},
+   {NDBD_EXIT_NODE_DECLARED_DEAD, XAE,
+    "Node declared dead. See error log for details"},
    {NDBD_EXIT_POINTER_NOTINRANGE, XIE, "Pointer too large"},
    {NDBD_EXIT_SR_OTHERNODEFAILED, XRE, "Another node failed during system "
     "restart, please investigate error(s) on other node(s)"},