Commit c891d928 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.1-new-ndb-bj 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
parents a42cf6f5 2351ac24

storage/ndb/include/kernel/ndb_limits.h

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ 
#define MAX_NODES     64

#define UNDEF_NODEGROUP 0xFFFF



/**************************************************************************

 * 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

 */

storage/ndb/src/mgmsrv/ConfigInfo.cpp

+6 −6
Original line number Diff line number Diff line
@@ -397,7 +397,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,
@@ -409,7 +409,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_DATA_NODE_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) },



  {

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

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },

  

  {

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

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },

  

  {

    CFG_LOG_DESTINATION,