bk commit into 5.1 tree (tomas:1.2496) BUG#25741

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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-27 12:11:29+02:00, tomas@stripped +1 -0
  Bug #25741 Unable to allocate node id during restarting data node
  - add additional sleep so that we don't get 100% cpu usage retrying saomething that can
take some time before succeeding

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp@stripped, 2007-04-27 12:11:27+02:00,
tomas@stripped +5 -0
    Bug #25741 Unable to allocate node id during restarting data node
    - add additional sleep so that we don't get 100% cpu usage retrying saomething that
can take some time before succeeding

# 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:	tomas
# Host:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-single-user

--- 1.128/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-04-26 22:51:33 +02:00
+++ 1.129/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2007-04-27 12:11:27 +02:00
@@ -2167,6 +2167,11 @@
         nodeId = refToNode(ref->masterRef);
 	if (!theFacade->get_node_alive(nodeId))
 	  nodeId = 0;
+        if (ref->errorCode != AllocNodeIdRef::NotMaster)
+        {
+          /* sleep for a while (100ms) before retrying */
+          NdbSleep_MilliSleep(100);  
+        }
         continue;
       }
       return ref->errorCode;