← Back to branch summary

~mdcallag/+junk/5.1-map

« back to all changes in this revision

Viewing changes to storage/ndb/src/mgmapi/mgmapi_configuration.cpp

  • Committer: msvensson at pilot
  • Date: 2007-04-24 09:11:45 UTC
  • mfrom: (2469.1.106)
  • Revision ID: sp1r-msvensson@pilot.blaudden-20070424091145-10463
Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/ndb/src/mgmapi/mgmapi_configuration.cpp
16
16
#include <ndb_types.h>
17
17
#include <mgmapi.h>
18
18
#include "mgmapi_configuration.hpp"
19
 
#include "../mgmsrv/ParamInfo.hpp"
20
 
 
21
 
extern const ParamInfo ParamInfoArray[];
22
 
extern const int ParamInfoNum;
 
19
#include "../mgmsrv/ConfigInfo.hpp"
23
20
 
24
21
ndb_mgm_configuration_iterator::ndb_mgm_configuration_iterator
25
22
(const ndb_mgm_configuration & conf, unsigned type_of_section)
187
184
      return -1;
188
185
  }
189
186
 
190
 
  for (int i = 0; i < ParamInfoNum; i++) {
191
 
    if (paramId == ParamInfoArray[i]._paramId && strcmp(DB_TOKEN, ParamInfoArray[i]._section) == 0) {
 
187
  ConfigInfo data;
 
188
  for (int i = 0; i < data.m_NoOfParams; i++) {
 
189
    if (paramId == data.m_ParamInfo[i]._paramId && strcmp("DB", data.m_ParamInfo[i]._section) == 0) {
192
190
        size_t tmp = 0;
193
191
        if (tmp + sizeof(info->m_id) <= *size)
194
192
        {
195
 
          info->m_id = ParamInfoArray[i]._paramId;
 
193
          info->m_id = data.m_ParamInfo[i]._paramId;
196
194
          tmp += sizeof(info->m_id);
197
195
        }
198
196
 
199
197
        if (tmp + sizeof(info->m_name) <= *size)
200
198
        {
201
 
          info->m_name = ParamInfoArray[i]._fname;
 
199
          info->m_name = data.m_ParamInfo[i]._fname;
202
200
          tmp += sizeof(info->m_name);
203
201
        }
204
202