bk commit into 5.0 tree (gni:1.2512) BUG#28298

[gni]

Below is the list of changes that have just been committed into a local
5.0 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-09-28 09:49:16+08:00, gni@stripped +2 -0
  BUG#28298 Node Id larger than MAX_NDB_NODES in config file doesn't generate error

  ndb/include/kernel/ndb_limits.h@stripped, 2007-09-28 09:49:14+08:00, gni@stripped +11 -0
    1) define a macro MAX_DATA_NODE_ID to set the max ID of data nodes to be MAX_NDB_NODES - 1
    2) define a macro MAX_NODES_ID to set the max ID of API and MGM to be MAX_NODES -1

  ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-09-28 09:49:14+08:00, gni@stripped +6 -6
    1) replace MAX_NODES with MAX_DATA_NODE_ID (= MAX_NDB_NODES - 1)  when the NodeId represents data nodes.
    2) replace MAX_NODES with MAX_NODES_ID (= MAX_NODES -1) when the NodeId represents API or MGM nodes.

# 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.0/bug28298

--- 1.18/ndb/include/kernel/ndb_limits.h	2007-09-28 09:49:22 +08:00
+++ 1.19/ndb/include/kernel/ndb_limits.h	2007-09-28 09:49:22 +08:00
@@ -27,6 +27,17 @@
 #define MAX_NDB_NODES 49
 #define MAX_NODES     64
 
+/**************************************************************************
+ * IT SHOULD BE (MAX_NDB_NODES - 1).
+ * WHEN MAX_NDB_NODE IS CHANGED, IT SHOULD BE CHANGED ALSO
+ **************************************************************************/
+#define MAX_DATA_NODE_ID 48
+/**************************************************************************
+ * IT SHOULD BE (MAX_NODES - 1).
+ * WHEN MAX_NODES IS CHANGED, IT SHOULD BE CHANGED ALSO
+ **************************************************************************/
+#define MAX_NODES_ID 63
+
 /**
  * MAX_API_NODES = MAX_NODES - No of NDB Nodes in use
  */

--- 1.86/ndb/src/mgmsrv/ConfigInfo.cpp	2007-09-28 09:49:22 +08:00
+++ 1.87/ndb/src/mgmsrv/ConfigInfo.cpp	2007-09-28 09:49:22 +08:00
@@ -398,7 +398,7 @@
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_DATA_NODE_ID) },
 
   {
     CFG_NODE_ID,
@@ -410,7 +410,7 @@
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_DATA_NODE_ID) },
 
   {
     KEY_INTERNAL,
@@ -1261,7 +1261,7 @@
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
 
   {
     CFG_NODE_ID,
@@ -1273,7 +1273,7 @@
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
 
   {
     KEY_INTERNAL,
@@ -1404,7 +1404,7 @@
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
   
   {
     CFG_NODE_ID,
@@ -1416,7 +1416,7 @@
     ConfigInfo::CI_INT,
     MANDATORY,
     "1",
-    STR_VALUE(MAX_NODES) },
+    STR_VALUE(MAX_NODES_ID) },
   
   {
     CFG_LOG_DESTINATION,