diff options
| author | unknown <joerg@trift2.> | 2008-02-22 16:36:09 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-02-22 16:36:09 +0100 |
| commit | 1bee6a3c7c299565ac8b165d7331b9b5ec4e38e6 (patch) | |
| tree | 6a21bcf6953d1c77cefe577e712cbc6cd89111d8 /ndb/src/mgmsrv/ConfigInfo.cpp | |
| parent | ae1eaff2d4bb064fb7685a3fd0060c812fa3d201 (diff) | |
| parent | 2fa3d82847aa6e50d4bbb36493d1f3c237bc068d (diff) | |
| download | mariadb-git-1bee6a3c7c299565ac8b165d7331b9b5ec4e38e6.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
Diffstat (limited to 'ndb/src/mgmsrv/ConfigInfo.cpp')
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp index 3600dfdeab3..2a22fc72183 100644 --- a/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/ndb/src/mgmsrv/ConfigInfo.cpp @@ -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, |