Commit b5368c1b authored by gni@dev3-221.dev.cn.tlan's avatar gni@dev3-221.dev.cn.tlan
Browse files

Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298
parents 9ca2177b 60a18580

ndb/include/kernel/ndb_limits.h

+11 −0
Original line number Diff line number Diff line
@@ -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

 */

ndb/src/mgmsrv/ConfigInfo.cpp

+6 −6
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_DATA_NODE_ID) },



  {

    CFG_NODE_ID,
@@ -410,7 +410,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_DATA_NODE_ID) },



  {

    KEY_INTERNAL,
@@ -1261,7 +1261,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },



  {

    CFG_NODE_ID,
@@ -1273,7 +1273,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },



  {

    KEY_INTERNAL,
@@ -1404,7 +1404,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },

  

  {

    CFG_NODE_ID,
@@ -1416,7 +1416,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },

  

  {

    CFG_LOG_DESTINATION,