bk commit into 4.1 tree (joreland:1.2334)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2334 05/07/25 12:41:25 joreland@stripped +4 -0
  ndb - Fix LCP during SR parameters

  ndb/src/mgmsrv/ConfigInfo.cpp
    1.56 05/07/25 12:41:22 joreland@stripped +4 -4
    Fix LCP during SR parameters

  ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
    1.15 05/07/25 12:41:22 joreland@stripped +4 -2
    Fix LCP during SR parameters

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.34 05/07/25 12:41:22 joreland@stripped +4 -2
    Fix LCP during SR parameters

  ndb/include/mgmapi/mgmapi_config_parameters.h
    1.16 05/07/25 12:41:22 joreland@stripped +5 -2
    Fix LCP during SR parameters

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joreland
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-4.1

--- 1.15/ndb/include/mgmapi/mgmapi_config_parameters.h	2005-03-10 07:45:15 +01:00
+++ 1.16/ndb/include/mgmapi/mgmapi_config_parameters.h	2005-07-25 12:41:22 +02:00
@@ -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

--- 1.55/ndb/src/mgmsrv/ConfigInfo.cpp	2005-05-25 16:19:14 +02:00
+++ 1.56/ndb/src/mgmsrv/ConfigInfo.cpp	2005-07-25 12:41:22 +02:00
@@ -928,7 +928,7 @@
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    KEY_INTERNAL,
+    CFG_DB_LCP_DISC_PAGES_TUP_SR,
     "NoOfDiskPagesToDiskDuringRestartTUP",
     DB_TOKEN,
     "?",
@@ -940,7 +940,7 @@
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    KEY_INTERNAL,
+    CFG_DB_LCP_DISC_PAGES_TUP,
     "NoOfDiskPagesToDiskAfterRestartTUP",
     DB_TOKEN,
     "?",
@@ -952,7 +952,7 @@
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    KEY_INTERNAL,
+    CFG_DB_LCP_DISC_PAGES_ACC_SR,
     "NoOfDiskPagesToDiskDuringRestartACC",
     DB_TOKEN,
     "?",
@@ -964,7 +964,7 @@
     STR_VALUE(MAX_INT_RNIL) },
 
   {
-    KEY_INTERNAL,
+    CFG_DB_LCP_DISC_PAGES_ACC,
     "NoOfDiskPagesToDiskAfterRestartACC",
     DB_TOKEN,
     "?",

--- 1.33/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2005-07-01 09:57:44 +02:00
+++ 1.34/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2005-07-25 12:41:22 +02:00
@@ -722,10 +722,12 @@
   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);

--- 1.14/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2005-01-19 09:15:31 +01:00
+++ 1.15/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2005-07-25 12:41:22 +02:00
@@ -663,10 +663,12 @@
   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()