Commit 29911d7c authored by unknown's avatar unknown
Browse files

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
parents 414eb710 ea010ef5

ndb/include/mgmapi/mgmapi_config_parameters.h

+5 −2
Original line number Diff line number Diff line
@@ -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

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+4 −2
Original line number Diff line number Diff line
@@ -731,10 +731,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);

ndb/src/kernel/blocks/dbtup/DbtupGen.cpp

+4 −2
Original line number Diff line number Diff line
@@ -672,10 +672,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()

ndb/src/mgmsrv/ConfigInfo.cpp

+4 −4
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    STR_VALUE(MAX_INT_RNIL) },



  {

    KEY_INTERNAL,

    CFG_DB_LCP_DISC_PAGES_TUP_SR,

    "NoOfDiskPagesToDiskDuringRestartTUP",

    DB_TOKEN,

    "?",
@@ -927,7 +927,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    STR_VALUE(MAX_INT_RNIL) },



  {

    KEY_INTERNAL,

    CFG_DB_LCP_DISC_PAGES_TUP,

    "NoOfDiskPagesToDiskAfterRestartTUP",

    DB_TOKEN,

    "?",
@@ -939,7 +939,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    STR_VALUE(MAX_INT_RNIL) },



  {

    KEY_INTERNAL,

    CFG_DB_LCP_DISC_PAGES_ACC_SR,

    "NoOfDiskPagesToDiskDuringRestartACC",

    DB_TOKEN,

    "?",
@@ -951,7 +951,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    STR_VALUE(MAX_INT_RNIL) },



  {

    KEY_INTERNAL,

    CFG_DB_LCP_DISC_PAGES_ACC,

    "NoOfDiskPagesToDiskAfterRestartACC",

    DB_TOKEN,

    "?",