bk commit into 5.1 tree (jonas:1.2109)

[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 22:06:44+01:00, jonas@stripped +3 -0
  ndb - drop6
    fix bug with nodeids > 48

  mysql-test/ndb/ndb_config_2_node.ini@stripped, 2007-02-07 22:06:43+01:00, jonas@stripped +17 -0
    fix bug with nodeids > 48

  mysql-test/r/ndb_config.result@stripped, 2007-02-07 22:06:43+01:00, jonas@stripped +2 -2
    fix bug with nodeids > 48

  storage/ndb/src/ndbapi/ClusterMgr.hpp@stripped, 2007-02-07 22:06:43+01:00, jonas@stripped +1 -1
    fix bug with nodeids > 48

# 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/drop6

--- 1.6/mysql-test/r/ndb_config.result	2007-02-07 22:06:48 +01:00
+++ 1.7/mysql-test/r/ndb_config.result	2007-02-07 22:06:48 +01:00
@@ -1,9 +1,9 @@
-ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,11,
+ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,63, mysqld,127, mysqld,192, mysqld,228, mysqld,255,
 1,localhost,10485760,1048576 2,localhost,10485760,1048576
 1 localhost 10485760 1048576
 2 localhost 10485760 1048576
 1 2
-ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,11,
+ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3,localhost mysqld,4, mysqld,5, mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10, mysqld,63, mysqld,127, mysqld,192, mysqld,228, mysqld,255,
 ndbd,1,localhost,52428800,26214400 ndbd,2,localhost,52428800,36700160 ndbd,3,localhost,52428800,52428800 ndbd,4,localhost,52428800,52428800 ndb_mgmd,5,localhost,, mysqld,6,localhost,,
 ndbd,1,localhost ndbd,2,localhost ndbd,3,localhost ndbd,4,localhost ndb_mgmd,5,localhost mysqld,6, mysqld,7, mysqld,8, mysqld,9, mysqld,10,
 Cluster configuration warning line 0: Could not use next node id 2 for section [API], using next unused node id 7.

--- 1.13/storage/ndb/src/ndbapi/ClusterMgr.hpp	2007-02-07 22:06:48 +01:00
+++ 1.14/storage/ndb/src/ndbapi/ClusterMgr.hpp	2007-02-07 22:06:48 +01:00
@@ -84,7 +84,7 @@
 private:
   Uint32        noOfAliveNodes;
   Uint32        noOfConnectedNodes;
-  Node          theNodes[MAX_NDB_NODES];
+  Node          theNodes[MAX_NODES];
   NdbThread*    theClusterMgrThread;
   
   /**

--- 1.16/mysql-test/ndb/ndb_config_2_node.ini	2007-02-07 22:06:48 +01:00
+++ 1.17/mysql-test/ndb/ndb_config_2_node.ini	2007-02-07 22:06:48 +01:00
@@ -13,17 +13,21 @@
 NoOfFragmentLogFiles= 3
 
 [ndbd]
+NodeId: 1
 HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
 
 [ndbd]
+NodeId: 2
 HostName= CHOOSE_HOSTNAME_2   # hostname is a valid network adress
 
 [ndb_mgmd]
+NodeId: 3
 HostName= CHOOSE_HOSTNAME_1   # hostname is a valid network adress
 DataDir= CHOOSE_FILESYSTEM    #
 PortNumber= CHOOSE_PORT_MGM
 
 [mysqld]
+NodeId: 4
 
 [mysqld]
 
@@ -38,3 +42,16 @@
 [mysqld]
 
 [mysqld]
+NodeId: 63
+
+[mysqld]
+NodeId: 127
+
+[mysqld]
+NodeId: 192
+
+[mysqld]
+NodeId: 228
+
+[mysqld]
+NodeId: 255