bk commit into 5.1 tree (stewart:1.1983)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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
  1.1983 05/12/03 11:30:02 stewart@stripped +1 -0
  WL#1504 Cluster online add/drop node
  
  in Dbdih::setNodeGroups, remove assumption that all nodes not in a nodegroup
  are hot spares.

  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.41 05/12/03 11:29:58 stewart@stripped +9 -2
    compute the number of hot spares accurrately now that we can have nodes in the
    cluster just in a Configured state.
    
    (even though hot spare code is currently disabled)

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/wl1504

--- 1.40/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-11-29 18:25:29 +01:00
+++ 1.41/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2005-12-03 11:29:58 +01:00
@@ -12843,6 +12843,8 @@
   NodeRecordPtr sngNodeptr;
   Uint32 Ti;
 
+  cnoHotSpare= 0;
+
   for (Ti = 0; Ti < MAX_NDB_NODES; Ti++) {
     NGPtr.i = Ti;
     ptrAss(NGPtr, nodeGroupRecord);
@@ -12868,10 +12870,16 @@
       NGPtr.p->nodeCount++;
       break;
     case Sysfile::NS_HotSpare:
+      jam();
+      cnoHotSpare++;
+      sngNodeptr.p->nodeGroup = ZNIL;
+      break;
     case Sysfile::NS_NotDefined:
-    case Sysfile::NS_Configured:
       jam();
       sngNodeptr.p->nodeGroup = ZNIL;
+    case Sysfile::NS_Configured:
+      jam();
+      sngNodeptr.p->nodeGroup = NO_NODE_GROUP_ID;
       break;
     default:
       ndbrequire(false);
@@ -12889,7 +12897,6 @@
       cnoOfNodeGroups++;
     }//if
   }//for
-  cnoHotSpare = csystemnodes - (cnoOfNodeGroups * cnoReplicas);
 }//Dbdih::setNodeGroups()
 
 /*************************************************************************/