diff options
author | unknown <joreland@mysql.com> | 2005-07-25 13:23:34 +0200 |
---|---|---|
committer | unknown <joreland@mysql.com> | 2005-07-25 13:23:34 +0200 |
commit | 29911d7c8bf4919406e6bd5535f8ab8a6aaa5bda (patch) | |
tree | 5d6883bf76eb711ce887c4bd087a6a40918dafe3 /ndb/include | |
parent | 414eb710e4e81cb41befc137565d273c96f10262 (diff) | |
parent | ea010ef58494b9e578ce85b890f4a95769227729 (diff) | |
download | mariadb-git-29911d7c8bf4919406e6bd5535f8ab8a6aaa5bda.tar.gz |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'ndb/include')
-rw-r--r-- | ndb/include/mgmapi/mgmapi_config_parameters.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h index 33134899d1e..8f95e159b38 100644 --- a/ndb/include/mgmapi/mgmapi_config_parameters.h +++ b/ndb/include/mgmapi/mgmapi_config_parameters.h @@ -50,8 +50,11 @@ #define CFG_DB_FILESYSTEM_PATH 125 #define CFG_DB_NO_REDOLOG_FILES 126 -#define CFG_DB_DISC_BANDWIDTH 127 -#define CFG_DB_SR_DISC_BANDWITH 128 + +#define CFG_DB_LCP_DISC_PAGES_TUP 127 +#define CFG_DB_LCP_DISC_PAGES_TUP_SR 128 +#define CFG_DB_LCP_DISC_PAGES_ACC 137 +#define CFG_DB_LCP_DISC_PAGES_ACC_SR 138 #define CFG_DB_TRANSACTION_CHECK_INTERVAL 129 #define CFG_DB_TRANSACTION_INACTIVE_TIMEOUT 130 |