bk commit into 5.1 tree (jonas:1.2424)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-02-07 21:06:17+01:00, jonas@stripped +3 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/telco-6.1.1
  into  perch.ndb.mysql.com:/home/jonas/src/51-telco
  MERGE: 1.2403.13.2

  configure.in@stripped, 2007-02-07 21:06:15+01:00, jonas@stripped +3 -5
    merge
    MERGE: 1.421.5.1

  storage/ndb/src/ndbapi/ClusterMgr.cpp@stripped, 2007-02-07 21:04:53+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.31.1.5

  storage/ndb/src/ndbapi/ClusterMgr.hpp@stripped, 2007-02-07 21:04:53+01:00, jonas@stripped +0 -0
    Auto merged
    MERGE: 1.15.1.1

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco/RESYNC

--- 1.425/configure.in	2007-02-07 21:06:22 +01:00
+++ 1.426/configure.in	2007-02-07 21:06:22 +01:00
@@ -7,12 +7,12 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.16-ndb-6.1.2)
+AM_INIT_AUTOMAKE(mysql, 5.1.16-ndb-6.2.0)
 AM_CONFIG_HEADER(config.h)
 
 NDB_VERSION_MAJOR=6
-NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=2
+NDB_VERSION_MINOR=2
+NDB_VERSION_BUILD=0
 NDB_VERSION_STATUS="-beta"
 
 PROTOCOL_VERSION=10

--- 1.34/storage/ndb/src/ndbapi/ClusterMgr.cpp	2007-02-07 21:06:22 +01:00
+++ 1.35/storage/ndb/src/ndbapi/ClusterMgr.cpp	2007-02-07 21:06:22 +01:00
@@ -164,7 +164,7 @@
     NodeBitmask ndb_nodes;
     ndb_nodes.clear();
     waitForHBFromNodes.clear();
-    for(Uint32 i = 0; i < MAX_NODES; i++)
+    for(Uint32 i = 0; i < MAX_NDB_NODES; i++)
     {
       if(!theNodes[i].defined)
         continue;

--- 1.16/storage/ndb/src/ndbapi/ClusterMgr.hpp	2007-02-07 21:06:22 +01:00
+++ 1.17/storage/ndb/src/ndbapi/ClusterMgr.hpp	2007-02-07 21:06:22 +01:00
@@ -90,7 +90,7 @@
 private:
   Uint32        noOfAliveNodes;
   Uint32        noOfConnectedNodes;
-  Node          theNodes[MAX_NDB_NODES];
+  Node          theNodes[MAX_NODES];
   NdbThread*    theClusterMgrThread;
 
   NodeBitmask   waitForHBFromNodes; // used in forcing HBs