mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
This commit is contained in:
unknown 2006-03-22 11:13:29 +01:00
commit 4b6ac944fe
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/ndb/ndb_config_2_node.ini
View file

@ -12,6 +12,9 @@ MaxNoOfAttributes= CHOOSE_MaxNoOfAttributes
TimeBetweenGlobalCheckpoints= 500 TimeBetweenGlobalCheckpoints= 500
NoOfFragmentLogFiles= 3 NoOfFragmentLogFiles= 3
DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory DiskPageBufferMemory= CHOOSE_DiskPageBufferMemory
# the following parametes just function as a small regression
# test that the parameter exists
InitialNoOfOpenFiles= 27
[ndbd] [ndbd]
HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress HostName= CHOOSE_HOSTNAME_1 # hostname is a valid network adress

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

@ -108,9 +108,11 @@ Ndbfs::execREAD_CONFIG_REQ(Signal* signal)
m_maxFiles = 40; 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);
Uint32 noIdleFiles = 27;
ndb_mgm_get_int_parameter(p, CFG_DB_INITIAL_OPEN_FILES, &noIdleFiles);
if (noIdleFiles > m_maxFiles)
m_maxFiles = noIdleFiles;
// Create idle AsyncFiles // Create idle AsyncFiles
Uint32 noIdleFiles = m_maxFiles > 27 ? 27 : m_maxFiles ;
for (Uint32 i = 0; i < noIdleFiles; i++){ for (Uint32 i = 0; i < noIdleFiles; i++){
theIdleFiles.push_back(createAsyncFile()); theIdleFiles.push_back(createAsyncFile());
} }

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

@ -892,6 +892,18 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
"20", "20",
STR_VALUE(MAX_INT_RNIL) }, STR_VALUE(MAX_INT_RNIL) },
{
CFG_DB_INITIAL_OPEN_FILES,
"InitialNoOfOpenFiles",
DB_TOKEN,
"Initial number of files open per "DB_TOKEN_PRINT" node.(One thread is created per file)",
ConfigInfo::CI_USED,
false,
ConfigInfo::CI_INT,
"27",
"20",
STR_VALUE(MAX_INT_RNIL) },
{ {
CFG_DB_TRANSACTION_CHECK_INTERVAL, CFG_DB_TRANSACTION_CHECK_INTERVAL,
"TimeBetweenInactiveTransactionAbortCheck", "TimeBetweenInactiveTransactionAbortCheck",