mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj

Browse source 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
This commit is contained in:
unknown 2007-04-03 17:07:00 +08:00
commit c18c32feda
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
View file

@ -105,11 +105,11 @@ Ndbfs::execREAD_CONFIG_REQ(Signal* signal)
theRequestPool = new Pool<Request>; theRequestPool = new Pool<Request>;
m_maxFiles = 40; m_maxFiles = 0;
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);
Uint32 noIdleFiles = 27; Uint32 noIdleFiles = 27;
ndb_mgm_get_int_parameter(p, CFG_DB_INITIAL_OPEN_FILES, &noIdleFiles); 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; m_maxFiles = noIdleFiles;
// Create idle AsyncFiles // Create idle AsyncFiles
for (Uint32 i = 0; i < noIdleFiles; i++){ for (Uint32 i = 0; i < noIdleFiles; i++){
@ -650,7 +650,7 @@ AsyncFile*
Ndbfs::createAsyncFile(){ Ndbfs::createAsyncFile(){
// Check limit of open files // 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 // Print info about all open files
for (unsigned i = 0; i < theFiles.size(); i++){ for (unsigned i = 0; i < theFiles.size(); i++){
AsyncFile* file = theFiles[i]; AsyncFile* file = theFiles[i];

2
storage/ndb/src/mgmsrv/ConfigInfo.cpp
View file

@ -879,7 +879,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
ConfigInfo::CI_USED, ConfigInfo::CI_USED,
false, false,
ConfigInfo::CI_INT, ConfigInfo::CI_INT,
"40", "0",
"20", "20",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },

2
storage/ndb/src/mgmsrv/ParamInfo.cpp
View file

@ -705,7 +705,7 @@ const ParamInfo ParamInfoArray[] = {
CI_USED, CI_USED,
false, false,
CI_INT, CI_INT,
"40", "0",
"20", "20",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },