bk commit into 5.1 tree (gni:1.2557) BUG#25741

[gni]

Below is the list of changes that have just been committed into a local
5.1 repository of gni. When gni 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@stripped, 2007-04-25 15:57:42+08:00, gni@stripped +2 -0
  BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2007-04-25 15:57:40+08:00, gni@stripped +2 -1
    When running nodes return AllocNodeIdRef::NodeFailureHandlingNotCompleted error during applying the node id for restarting nodes, it should try again.

  storage/ndb/src/ndbapi/ndberror.c@stripped, 2007-04-25 15:57:40+08:00, gni@stripped +1 -1
    change AllocNodeIdRef::NodeFailureHandlingNotCompleted error from permanent error to temporary error

# 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:	gni
# Host:	dev3-221.dev.cn.tlan
# Root:	/home/ngb/mysql/mysql-5.1/mysql-5.1-bug25741

--- 1.127/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-04-25 15:57:50 +08:00
+++ 1.128/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-04-25 15:57:50 +08:00
@@ -2160,7 +2160,8 @@
       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);

--- 1.88/storage/ndb/src/ndbapi/ndberror.c	2007-04-25 15:57:50 +08:00
+++ 1.89/storage/ndb/src/ndbapi/ndberror.c	2007-04-25 15:57:50 +08:00
@@ -471,7 +471,7 @@
   { 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" },
   
   /**