From 9e9df36d8e30c047ef8cd5c74623d5de16462fd9 Mon Sep 17 00:00:00 2001
From: "tomas@whalegate.ndb.mysql.com" <>
Date: Thu, 26 Apr 2007 22:49:58 +0200
Subject: [PATCH] BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted

---
 storage/ndb/src/mgmsrv/MgmtSrvr.cpp | 3 ++-
 storage/ndb/src/ndbapi/ndberror.c   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
index 34f4927f804..f377e78bb5f 100644
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2127,7 +2127,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);
diff --git a/storage/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
index ed3829ed74f..fc0d53b6a6e 100644
--- a/storage/ndb/src/ndbapi/ndberror.c
+++ b/storage/ndb/src/ndbapi/ndberror.c
@@ -470,7 +470,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" },
   
   /**