Commit e73d1aa0 authored by unknown's avatar unknown
Browse files

ndb dd - bug#16657 - add new config variable 


storage/ndb/include/kernel/ndb_limits.h:
  remove hardcoded limit
storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Introduce new config parameter for "SharedGlobalMemory",
    only user is so far undo log buffer memory
storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/SimBlockList.cpp:
  Fix compiler error
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/lgman.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/GlobalData.hpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Add new format "shared" page to easily migrate from/to superpool
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  better startup printouts
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Introduce new config parameter for "SharedGlobalMemory",
    only user is so far undo log buffer memory
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Fix bug in handling of my.cnf files
parent 5296fd96

storage/ndb/include/kernel/ndb_limits.h

+0 −6
Original line number Diff line number Diff line
@@ -149,10 +149,4 @@ 
 */

#define LCP_RESTORE_BUFFER (4*32)



/*

 * Log buffer pages

 *   8M

 */

#define LGMAN_LOG_BUFFER (8*32)



#endif

storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public: 
    fsFormatArrayOfPages=1,

    fsFormatListOfMemPages=2,

    fsFormatGlobalPage=3,

    fsFormatSharedPage=4,

    fsFormatMax

  };

storage/ndb/include/mgmapi/mgmapi_config_parameters.h

+3 −2
Original line number Diff line number Diff line
@@ -88,11 +88,12 @@ 
#define CFG_DB_STRING_MEMORY          161 /* used from 5.1 */

#define CFG_DB_INITIAL_OPEN_FILES     162 /* used from 5.1 */



#define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */



#define CFG_DB_DISK_PAGE_BUFFER_MEMORY 160

#define CFG_DB_STRING_MEMORY          161



#define CFG_DB_SGA                    198 /* super pool mem */

#define CFG_DB_DATA_MEM_2             199 /* used in special build in 5.1 */



#define CFG_NODE_ARBIT_RANK           200

#define CFG_NODE_ARBIT_DELAY          201

storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ printFSREADWRITEREQ(FILE * output, const Uint32 * theData, 
    break;

  case FsReadWriteReq::fsFormatGlobalPage:

    fprintf(output, "List of global pages)\n");

  case FsReadWriteReq::fsFormatSharedPage:

    fprintf(output, "List of shared pages)\n");

    break;

  default:

    fprintf(output, "fsFormatMax not handled\n");

storage/ndb/src/kernel/SimBlockList.cpp

+3 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */



#include "SimBlockList.hpp"

#include "EmulatorData.hpp"

#include <Emulator.hpp>

#include <SimulatedBlock.hpp>

#include <Cmvmi.hpp>

#include <Ndbfs.hpp>
@@ -85,7 +85,8 @@ SimBlockList::load(EmulatorData& data){ 
  SimulatedBlock * fs = 0;

  {

    Uint32 dl;

    const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();

    const ndb_mgm_configuration_iterator * p = 

      ctx.m_config.getOwnConfigIterator();

    if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){

      fs = NEW_BLOCK(VoidFs)(ctx);

    } else {