Commit 8bc693a9 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/41-work 

into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge
parents 1030d5c8 60873234

ndb/include/mgmapi/mgmapi_config_parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#define CFG_DB_BACKUP_DATA_BUFFER_MEM     134

#define CFG_DB_BACKUP_LOG_BUFFER_MEM      135

#define CFG_DB_BACKUP_WRITE_SIZE          136

#define CFG_DB_BACKUP_MAX_WRITE_SIZE      139



#define CFG_LOG_DESTINATION           147

ndb/src/mgmsrv/ConfigInfo.cpp

+13 −1
Original line number Diff line number Diff line
@@ -1199,7 +1199,19 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    false,

    ConfigInfo::CI_INT,

    "32K",

    "0",

    "2K",

    STR_VALUE(MAX_INT_RNIL) },



  { 

    CFG_DB_BACKUP_MAX_WRITE_SIZE,

    "BackupMaxWriteSize",

    DB_TOKEN,

    "Max size of filesystem writes made by backup (in bytes)",

    ConfigInfo::CI_USED,

    false,

    ConfigInfo::CI_INT,

    "256K",

    "2K",

    STR_VALUE(MAX_INT_RNIL) },



  /***************************************************************************