Commit 6a55195f authored by pekka@sama.ndb.mysql.com's avatar pekka@sama.ndb.mysql.com
Browse files

Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb 

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
parents 55712dc8 ab547213

storage/ndb/src/common/debugger/SignalLoggerManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ SignalLoggerManager::log(LogMode logMode, const char * params) 
  const int count = getParameter(blocks, "BLOCK=", params);

  

  int cnt = 0;

  if((count == 1 && blocks[0] == "ALL") ||

  if((count == 1 && !strcmp(blocks[0], "ALL")) ||

     count == 0){

    

    for (int number = 0; number < NO_OF_BLOCKS; ++number){

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ printSCANTABCONF(FILE * output, const Uint32 * theData, Uint32 len, Uint16 recei 
	  sig->transId1, sig->transId2);



  fprintf(output, " requestInfo: Eod: %d OpCount: %d\n", 

	  (requestInfo & ScanTabConf::EndOfData == ScanTabConf::EndOfData),

	  (requestInfo & ScanTabConf::EndOfData) == ScanTabConf::EndOfData,

	  (requestInfo & (~ScanTabConf::EndOfData)));

  size_t op_count= requestInfo & (~ScanTabConf::EndOfData);

  if(op_count){

storage/ndb/src/kernel/vm/pc.hpp

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
  theEmulatedJamBlockNumber = number(); \

  Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \

  *(Uint32*)(theEmulatedJam + tEmulatedJamIndex) = \

    ((theEmulatedJamBlockNumber << 20) | line); \

    ((theEmulatedJamBlockNumber << 20) | (line)); \

  theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }



#else
@@ -72,7 +72,7 @@ 
  theEmulatedJamBlockNumber = number(); \

  Uint32 tEmulatedJamIndex = theEmulatedJamIndex; \

  *(Uint32*)((UintPtr)theEmulatedJam + (Uint32)tEmulatedJamIndex) = \

    ((theEmulatedJamBlockNumber << 20) | line); \

    ((theEmulatedJamBlockNumber << 20) | (line)); \

  theEmulatedJamIndex = (tEmulatedJamIndex + 4) & JAM_MASK; }



#endif
@@ -231,6 +231,6 @@ 
#define MEMCOPY_PAGE(to, from, page_size_in_bytes) \

  memcpy((void*)(to), (void*)(from), (size_t)(page_size_in_bytes));

#define MEMCOPY_NO_WORDS(to, from, no_of_words) \

  memcpy((to), (void*)(from), (size_t)(no_of_words << 2));

  memcpy((to), (void*)(from), (size_t)((no_of_words) << 2));



#endif