diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-03-10 09:07:42 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-03-10 09:07:42 +0200 |
| commit | 2f7e93afabbbf95dd2e2f2701f4f9bc04846db98 (patch) | |
| tree | 4e2a6470e06766ef687951e1ea71c14dbf0d3b2f /ndb | |
| parent | 83fa3560bc13734b2d92c84064d836fd2e05bc8d (diff) | |
| parent | 16103a014fb5a26bac85736845209353642966f5 (diff) | |
| download | mariadb-git-2f7e93afabbbf95dd2e2f2701f4f9bc04846db98.tar.gz | |
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
innobase/log/log0recv.c:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'ndb')
| -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/kernel/blocks/trix/Trix.cpp | 2 | ||||
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h index 68b63d78fa8..33134899d1e 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/kernel/blocks/trix/Trix.cpp b/ndb/src/kernel/blocks/trix/Trix.cpp index 75bc19b6a20..cd11cb4d575 100644 --- a/ndb/src/kernel/blocks/trix/Trix.cpp +++ b/ndb/src/kernel/blocks/trix/Trix.cpp @@ -712,7 +712,7 @@ void Trix::setupSubscription(Signal* signal, SubscriptionRecPtr subRecPtr) subCreateReq->subscriptionType = SubCreateReq::SingleTableScan; sendSignal(SUMA_REF, GSN_SUB_CREATE_REQ, - signal, SubCreateReq::SignalLength, JBB, orderPtr, 1); + signal, SubCreateReq::SignalLength+1, JBB, orderPtr, 1); } void Trix::setupTableScan(Signal* signal, SubscriptionRecPtr subRecPtr) diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp index 5556855b9f7..67bf09fab10 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, |