diff options
| author | unknown <joreland@mysql.com> | 2005-07-24 08:27:16 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-07-24 08:27:16 +0200 |
| commit | eaf98500a420223911dfbd24dbd39605534ca2eb (patch) | |
| tree | 7637fd878ff1db69c4d122d6ff3988c65bbad933 /ndb/src/mgmsrv | |
| parent | 29f42518f2db1e05a1120cebeb2624fda91376d8 (diff) | |
| parent | 8dd5bd5e5501adcaa09e21b1f3846663a5d663c8 (diff) | |
| download | mariadb-git-eaf98500a420223911dfbd24dbd39605534ca2eb.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
merge
ndb/tools/Makefile.am:
merge
Diffstat (limited to 'ndb/src/mgmsrv')
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ndb/src/mgmsrv/ConfigInfo.hpp b/ndb/src/mgmsrv/ConfigInfo.hpp index 871ee62040e..788619db7fe 100644 --- a/ndb/src/mgmsrv/ConfigInfo.hpp +++ b/ndb/src/mgmsrv/ConfigInfo.hpp @@ -127,14 +127,14 @@ private: Properties m_info; Properties m_systemDefaults; - static const ParamInfo m_ParamInfo[]; - static const int m_NoOfParams; - static const AliasPair m_sectionNameAliases[]; static const char* m_sectionNames[]; static const int m_noOfSectionNames; public: + static const ParamInfo m_ParamInfo[]; + static const int m_NoOfParams; + static const SectionRule m_SectionRules[]; static const ConfigRule m_ConfigRules[]; static const int m_NoOfRules; |