summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2005-07-25 12:41:25 +0200
committerjoreland@mysql.com <>2005-07-25 12:41:25 +0200
commit07cdfdca69cbf6e348aa4cbe2fa2bce65c82f30a (patch)
tree8b0b07f991e86fd8f4d5e057fc327a84efad4e85
parentb285050e52cd22202559b8dd9c18f4a3645fa598 (diff)
downloadmariadb-git-07cdfdca69cbf6e348aa4cbe2fa2bce65c82f30a.tar.gz
ndb - Fix LCP during SR parameters
-rw-r--r--ndb/include/mgmapi/mgmapi_config_parameters.h7
-rw-r--r--ndb/src/kernel/blocks/dbacc/DbaccMain.cpp6
-rw-r--r--ndb/src/kernel/blocks/dbtup/DbtupGen.cpp6
-rw-r--r--ndb/src/mgmsrv/ConfigInfo.cpp8
4 files changed, 17 insertions, 10 deletions
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/ndb/include/mgmapi/mgmapi_config_parameters.h
index 432854d1d36..2e3b47eb42e 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
diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index 3313e22fe3a..1f0053e209a 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -722,10 +722,12 @@ void Dbacc::execREAD_CONFIG_REQ(Signal* signal)
ndbrestart1Lab(signal);
clblPagesPerTick = 50;
- //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTick);
+ ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_ACC_SR,
+ &clblPagesPerTick);
clblPagesPerTickAfterSr = 50;
- //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTickAfterSr);
+ ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_ACC,
+ &clblPagesPerTickAfterSr);
tdata0 = 0;
initialiseRecordsLab(signal, ref, senderData);
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
index 0d7430e662d..27f817d8abc 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
@@ -663,10 +663,12 @@ void Dbtup::execREAD_CONFIG_REQ(Signal* signal)
initialiseRecordsLab(signal, 0, ref, senderData);
clblPagesPerTick = 50;
- //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTick);
+ ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_TUP_SR,
+ &clblPagesPerTick);
clblPagesPerTickAfterSr = 50;
- //ndb_mgm_get_int_parameter(p, CFG_DB_, &clblPagesPerTickAfterSr);
+ ndb_mgm_get_int_parameter(p, CFG_DB_LCP_DISC_PAGES_TUP,
+ &clblPagesPerTickAfterSr);
}//Dbtup::execSIZEALT_REP()
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/ndb/src/mgmsrv/ConfigInfo.cpp
index 4612d17c9ce..41a3aa8c782 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/ndb/src/mgmsrv/ConfigInfo.cpp
@@ -928,7 +928,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
STR_VALUE(MAX_INT_RNIL) },
{
- KEY_INTERNAL,
+ CFG_DB_LCP_DISC_PAGES_TUP_SR,
"NoOfDiskPagesToDiskDuringRestartTUP",
DB_TOKEN,
"?",
@@ -940,7 +940,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
STR_VALUE(MAX_INT_RNIL) },
{
- KEY_INTERNAL,
+ CFG_DB_LCP_DISC_PAGES_TUP,
"NoOfDiskPagesToDiskAfterRestartTUP",
DB_TOKEN,
"?",
@@ -952,7 +952,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
STR_VALUE(MAX_INT_RNIL) },
{
- KEY_INTERNAL,
+ CFG_DB_LCP_DISC_PAGES_ACC_SR,
"NoOfDiskPagesToDiskDuringRestartACC",
DB_TOKEN,
"?",
@@ -964,7 +964,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = {
STR_VALUE(MAX_INT_RNIL) },
{
- KEY_INTERNAL,
+ CFG_DB_LCP_DISC_PAGES_ACC,
"NoOfDiskPagesToDiskAfterRestartACC",
DB_TOKEN,
"?",