Commit b263f63b authored by unknown's avatar unknown
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
parents bf466eee c18c32fe

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

+3 −3
Original line number Diff line number Diff line
@@ -105,11 +105,11 @@ Ndbfs::execREAD_CONFIG_REQ(Signal* signal) 


  theRequestPool = new Pool<Request>;



  m_maxFiles = 40;

  m_maxFiles = 0;

  ndb_mgm_get_int_parameter(p, CFG_DB_MAX_OPEN_FILES, &m_maxFiles);

  Uint32 noIdleFiles = 27;

  ndb_mgm_get_int_parameter(p, CFG_DB_INITIAL_OPEN_FILES, &noIdleFiles);

  if (noIdleFiles > m_maxFiles)

  if (noIdleFiles > m_maxFiles && m_maxFiles != 0)

    m_maxFiles = noIdleFiles;

  // Create idle AsyncFiles

  for (Uint32 i = 0; i < noIdleFiles; i++){
@@ -650,7 +650,7 @@ AsyncFile* 
Ndbfs::createAsyncFile(){



  // Check limit of open files

  if (theFiles.size()+1 ==  m_maxFiles) {

  if (m_maxFiles !=0 && theFiles.size()+1 ==  m_maxFiles) {

    // Print info about all open files

    for (unsigned i = 0; i < theFiles.size(); i++){

      AsyncFile* file = theFiles[i];

storage/ndb/src/mgmsrv/ConfigInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_USED,

    false,

    ConfigInfo::CI_INT,

    "40",

    "0",

    "20",

    STR_VALUE(MAX_INT_RNIL) },

storage/ndb/src/mgmsrv/ParamInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ const ParamInfo ParamInfoArray[] = { 
    CI_USED,

    false,

    CI_INT,

    "40",

    "0",

    "20",

    STR_VALUE(MAX_INT_RNIL) },