Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca

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

storage/ndb/src/mgmsrv/MgmtSrvr.cpp

@@ -2160,7 +2160,8 @@ MgmtSrvr::alloc_node_id_req(NodeId free_node_id, enum ndb_mgm_node_type type)
       const AllocNodeIdRef * const ref =
         CAST_CONSTPTR(AllocNodeIdRef, signal->getDataPtr());
       if (ref->errorCode == AllocNodeIdRef::NotMaster ||
-          ref->errorCode == AllocNodeIdRef::Busy)
+          ref->errorCode == AllocNodeIdRef::Busy ||
+          ref->errorCode == AllocNodeIdRef::NodeFailureHandlingNotCompleted)
       {
         do_send = 1;
         nodeId = refToNode(ref->masterRef);

storage/ndb/src/ndbapi/ndberror.c

@@ -471,7 +471,7 @@ ErrorBundle ErrorCodes[] = {
   { 1700, DMEC, IE, "Undefined error" },
   { 1701, DMEC, AE, "Node already reserved" },
   { 1702, DMEC, AE, "Node already connected" },
-  { 1703, DMEC, AE, "Node failure handling not completed" },
+  { 1703, DMEC, IT, "Node failure handling not completed" },
   { 1704, DMEC, AE, "Node type mismatch" },
   
   /**