Commit d357dba8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/fix 

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/trix/Trix.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
parents 62174867 4b5c3e6e

ndb/include/mgmapi/mgmapi_config_parameters.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ 


#define CFG_DB_BACKUP_DATADIR         158



#define CFG_DB_MAX_OPEN_FILES         159



#define CFG_NODE_ARBIT_RANK           200

#define CFG_NODE_ARBIT_DELAY          201

ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp

+3 −3
Original line number Diff line number Diff line
@@ -66,10 +66,10 @@ Ndbfs::Ndbfs(const Configuration & conf) : 
  ndbrequire(p != 0);



  m_maxFiles = 40;

  //ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);

  ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);

  

  // Create idle AsyncFiles

  Uint32 noIdleFiles = 27;

  Uint32 noIdleFiles = m_maxFiles > 27  ? 27 : m_maxFiles ;

  for (Uint32 i = 0; i < noIdleFiles; i++){

    theIdleFiles.push_back(createAsyncFile());

  }

ndb/src/mgmsrv/ConfigInfo.cpp

+2 −3
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    STR_VALUE(MAX_INT_RNIL) },



  {

    KEY_INTERNAL,

    CFG_DB_MAX_OPEN_FILES,

    "MaxNoOfOpenFiles",

    DB_TOKEN,

    "Max number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
@@ -882,8 +882,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    "40",

    "20",

    "256" },



    STR_VALUE(MAX_INT_RNIL) },

  

  {

    CFG_DB_TRANSACTION_CHECK_INTERVAL,