Commit b68c1a71 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into  mysql.com:/home/jonas/src/mysql-4.1-push


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.hpp:
  Auto merged
parents 824f512e ea010ef5

mysql-test/r/ndb_config.result

0 → 100644
+5 −0
Original line number Diff line number Diff line 
ndbd,1,localhost ndbd,2,localhost ndb_mgmd,3, mysqld,4, mysqld,5, mysqld,6, mysqld,7,

1,localhost,41943040,12582912 2,localhost,41943040,12582912

1 localhost 41943040 12582912

2 localhost 41943040 12582912

1 2

mysql-test/t/ndb_config.test

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=type,nodeid,host 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults -r \\n -f " " --query=nodeid,host,DataMemory,IndexMemory --type=ndbd 2> /dev/null

--exec $NDB_TOOLS_DIR/ndb_config --no-defaults --query=nodeid --type=ndbd --host=localhost 2> /dev/null

ndb/include/mgmapi/mgmapi.h

+7 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
 *  @{

 */



#include <stdio.h>

#include <ndb_types.h>

#include "mgmapi_config_parameters.h"
@@ -351,6 +352,12 @@ extern "C" { 
  int ndb_mgm_get_latest_error_line(const NdbMgmHandle handle);

#endif



  /**

   * Set error stream

   */

  void ndb_mgm_set_error_stream(NdbMgmHandle, FILE *);





  /** @} *********************************************************************/

  /** 

   * @name Functions: Create/Destroy Management Server Handles

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
@@ -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);