Commit 6f85ba17 authored by unknown's avatar unknown
Browse files

Merge eel.(none):/home/jonas/src/mysql-5.0 

into  eel.(none):/home/jonas/src/mysql-5.0-push
parents 28ed7dd9 8c1b55ef

ndb/include/kernel/signaldata/SignalData.hpp

+1 −0
Original line number Diff line number Diff line
@@ -222,5 +222,6 @@ GSN_PRINT_SIGNATURE(printSCAN_FRAGREQ); 


GSN_PRINT_SIGNATURE(printCONTINUEB_NDBFS);

GSN_PRINT_SIGNATURE(printCONTINUEB_DBDIH);

GSN_PRINT_SIGNATURE(printSTART_FRAG_REQ);



#endif

ndb/include/kernel/signaldata/StartFragReq.hpp

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ class StartFragReq { 
public:

  STATIC_CONST( SignalLength = 19 );



  friend bool printSTART_FRAG_REQ(FILE *, const Uint32 *, Uint32, Uint16);

  

private:

  Uint32 userPtr;

  Uint32 userRef;

ndb/src/common/debugger/EventLogger.cpp

+4 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ EventLoggerBase::~EventLoggerBase() 
  

}





#define QQQQ char *m_text, size_t m_text_len, const Uint32* theData



void getTextConnected(QQQQ) {
@@ -434,10 +433,12 @@ void getTextNR_CopyFragsCompleted(QQQQ) { 
void getTextLCPFragmentCompleted(QQQQ) {

  BaseString::snprintf(m_text, m_text_len, 

		       "Table ID = %u, fragment ID = %u has completed LCP "

		       "on Node %u", 

		       "on Node %u maxGciStarted: %d maxGciCompleted: %d", 

		       theData[2], 

		       theData[3], 

		       theData[1]);

		       theData[1],

		       theData[4],

		       theData[5]);

}

void getTextTransReportCounters(QQQQ) {

  // -------------------------------------------------------------------

ndb/src/common/debugger/signaldata/SignalDataPrint.cpp

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ SignalDataPrintFunctions[] = { 
  ,{ GSN_ACC_LOCKREQ, printACC_LOCKREQ }

  ,{ GSN_LQH_TRANSCONF, printLQH_TRANSCONF }

  ,{ GSN_SCAN_FRAGREQ, printSCAN_FRAGREQ }

  ,{ GSN_START_FRAGREQ, printSTART_FRAG_REQ }

  ,{ 0, 0 }

};

ndb/src/common/debugger/signaldata/StartRec.cpp

+25 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <RefConvert.hpp>

#include <signaldata/StartRec.hpp>

#include <signaldata/StartFragReq.hpp>



bool

printSTART_REC_REQ(FILE * output,
@@ -50,3 +51,27 @@ printSTART_REC_CONF(FILE * output, 


  return true;

}



bool 

printSTART_FRAG_REQ(FILE * output, 

		    const Uint32 * theData, 

		    Uint32 len, 

		    Uint16 recBlockNo)

{

  StartFragReq* sig = (StartFragReq*)theData;



  fprintf(output, " table: %d frag: %d lcpId: %d lcpNo: %d #nodes: %d \n",

	  sig->tableId, sig->fragId, sig->lcpId, sig->lcpNo, 

	  sig->noOfLogNodes);



  for(Uint32 i = 0; i<sig->noOfLogNodes; i++)

  {

    fprintf(output, " (node: %d startGci: %d lastGci: %d)",

	    sig->lqhLogNode[i],

	    sig->startGci[i],

	    sig->lastGci[i]);

  }

    

  fprintf(output, "\n");

  return true; 

}