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
19 years ago · e716434ca9
2 changed files with 2 additions and 2 deletions
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
@ -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,
--- a/storage/ndb/src/mgmsrv/ParamInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ParamInfo.cpp
@ -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,