diff options
| author | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-04-03 17:07:00 +0800 |
|---|---|---|
| committer | unknown <Justin.He/justin.he@dev3-240.dev.cn.tlan> | 2007-04-03 17:07:00 +0800 |
| commit | c18c32feda4b76f3648369e636230533546b764d (patch) | |
| tree | 874b2726e29ffaa28c6a0d3db8e6cdc74b8b8e79 /storage | |
| parent | e6c667b117680c260b1a47c7ac3b21d271de39e3 (diff) | |
| parent | 7180350956e9ada45774953832d1c9357615f5b7 (diff) | |
| download | mariadb-git-c18c32feda4b76f3648369e636230533546b764d.tar.gz | |
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp | 6 | ||||
| -rw-r--r-- | storage/ndb/src/mgmsrv/ConfigInfo.cpp | 2 | ||||
| -rw-r--r-- | storage/ndb/src/mgmsrv/ParamInfo.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp index 6fb9ef774d0..aa124770d23 100644 --- a/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp +++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp @@ -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]; diff --git a/storage/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp index 6351af7246e..224758f8c5f 100644 --- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp @@ -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) }, diff --git a/storage/ndb/src/mgmsrv/ParamInfo.cpp b/storage/ndb/src/mgmsrv/ParamInfo.cpp index 888b7948c05..a05472de2cb 100644 --- a/storage/ndb/src/mgmsrv/ParamInfo.cpp +++ b/storage/ndb/src/mgmsrv/ParamInfo.cpp @@ -705,7 +705,7 @@ const ParamInfo ParamInfoArray[] = { CI_USED, false, CI_INT, - "40", + "0", "20", STR_VALUE(MAX_INT_RNIL) }, |