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/src/mgmsrv | |
| 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/src/mgmsrv')
| -rw-r--r-- | ndb/src/mgmsrv/ConfigInfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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, |