Commit a594818b authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  merge
parents 84b87d69 31616b1b

storage/ndb/include/kernel/ndb_limits.h

+0 −6
Original line number Diff line number Diff line
@@ -150,10 +150,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

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



#include "SimBlockList.hpp"

#include <Emulator.hpp>

#include <SimulatedBlock.hpp>

#include <Cmvmi.hpp>

#include <Ndbfs.hpp>
@@ -69,7 +70,7 @@ void * operator new (size_t sz, SIMBLOCKLIST_DUMMY dummy){ 
#endif



void 

SimBlockList::load(Configuration & conf){

SimBlockList::load(EmulatorData& data){

  noOfBlocks = NO_OF_BLOCKS;

  theList = new SimulatedBlock * [noOfBlocks];

  Dbdict* dbdict = 0;
@@ -78,12 +79,13 @@ SimBlockList::load(Configuration & conf){ 
  Lgman* lg = 0;

  Tsman* ts = 0;



  Block_context ctx(conf, * (Ndbd_mem_manager*)0);

  Block_context ctx(conf, *data.m_mem_manager);

  

  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 {