diff options
| author | unknown <joreland@mysql.com> | 2005-03-10 07:48:44 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-03-10 07:48:44 +0100 |
| commit | d357dba8cf39478df69c29d78e45dea9c5af5686 (patch) | |
| tree | 3841a658e5668b780f07c63d498c68cd807c5c1a | |
| parent | 621748677421cc713c8b984832841033c1a8e5be (diff) | |
| parent | 4b5c3e6e428f5fef4cf837c4467b12c4c4a818ff (diff) | |
| download | mariadb-git-d357dba8cf39478df69c29d78e45dea9c5af5686.tar.gz | |
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
| -rw-r--r-- | ndb/include/mgmapi/mgmapi_config_parameters.h | 2 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp | 6 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h index 8a04ee2fe37..432854d1d36 100644 --- a/ndb/include/mgmapi/mgmapi_config_parameters.h +++ b/ndb/include/mgmapi/mgmapi_config_parameters.h @@ -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 diff --git a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp index 9c943760e31..9750e1c5179 100644 --- a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp +++ b/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp @@ -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()); } diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp index 07310e3a8b8..a0ace4b30db 100644 --- a/ndb/src/mgmsrv/ConfigInfo.cpp +++ b/ndb/src/mgmsrv/ConfigInfo.cpp @@ -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, |