Commit e716434c authored by unknown's avatar unknown
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug19378


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
parents d10a21e8 8af0f416

storage/ndb/src/mgmsrv/ConfigInfo.cpp

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

    "128",

    "8",

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_TABLES) },

  

  {

    CFG_DB_NO_ORDERED_INDEXES,

storage/ndb/src/mgmsrv/ParamInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ const ParamInfo ParamInfoArray[] = { 
    CI_INT,

    "128",

    "8",

    STR_VALUE(MAX_INT_RNIL) },

    STR_VALUE(MAX_TABLES) },

  

  {

    CFG_DB_NO_ORDERED_INDEXES,