bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3434)

[Ole John Aske]

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped

 3434 Ole John Aske	2011-02-14
      Recommit: SPJ-scan-scan: '#ifdef DEBUG_SCAN_FRAGREQ' code incorrectly used 
      printSCANNEXTREQ() instead of printSCANFRAGNEXTREQ() to dump the 
      signal contents to debug output.
     @ storage/ndb/include/kernel/signaldata/SignalData.hpp
        Added missing decl' of printSCANFRAGNEXTREQ

    modified:
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/SignalData.hpp'
--- a/storage/ndb/include/kernel/signaldata/SignalData.hpp	2011-02-08 14:29:52 +0000
+++ b/storage/ndb/include/kernel/signaldata/SignalData.hpp	2011-02-14 10:05:55 +0000
@@ -171,6 +171,7 @@ GSN_PRINT_SIGNATURE(printSCANTABREQ);
 GSN_PRINT_SIGNATURE(printSCANTABCONF);
 GSN_PRINT_SIGNATURE(printSCANTABREF);
 GSN_PRINT_SIGNATURE(printSCANNEXTREQ); 
+GSN_PRINT_SIGNATURE(printSCANFRAGNEXTREQ); 
 GSN_PRINT_SIGNATURE(printLQH_FRAG_REQ);
 GSN_PRINT_SIGNATURE(printLQH_FRAG_REF);
 GSN_PRINT_SIGNATURE(printLQH_FRAG_CONF);

=== modified file 'storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-02-12 10:15:53 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-02-14 10:05:55 +0000
@@ -1893,8 +1893,8 @@ Dbspj::execSCAN_NEXTREQ(Signal* signal)
 
   DEBUG("Incomming SCAN_NEXTREQ");
 #ifdef DEBUG_SCAN_FRAGREQ
-  printSCANNEXTREQ(stdout, &signal->theData[0], ScanFragNextReq:: SignalLength,
-                   DBLQH);
+  printSCANFRAGNEXTREQ(stdout, &signal->theData[0], 
+                       ScanFragNextReq::SignalLength, DBLQH);
 #endif
 
   Request key;
@@ -4071,8 +4071,8 @@ Dbspj::scanFrag_execSCAN_NEXTREQ(Signal*
   DEBUG("scanFrag_execSCAN_NEXTREQ to: " << hex << treeNodePtr.p->m_send.m_ref
         << ", senderData: " << req->senderData);
 #ifdef DEBUG_SCAN_FRAGREQ
-  printSCANNEXTREQ(stdout, &signal->theData[0], ScanFragNextReq:: SignalLength,
-                   DBLQH);
+  printSCANFRAGNEXTREQ(stdout, &signal->theData[0], 
+                       ScanFragNextReq::SignalLength, DBLQH);
 #endif
 
   sendSignal(treeNodePtr.p->m_send.m_ref,
@@ -5257,8 +5257,8 @@ Dbspj::scanIndex_execSCAN_NEXTREQ(Signal
             << ", senderData: " << req->senderData);
 
 #ifdef DEBUG_SCAN_FRAGREQ
-      printSCANNEXTREQ(stdout, &signal->theData[0],
-                       ScanFragNextReq:: SignalLength + 1, DBLQH);
+      printSCANFRAGNEXTREQ(stdout, &signal->theData[0],
+                           ScanFragNextReq:: SignalLength + 1, DBLQH);
 #endif
 
       req->senderData = fragPtr.i;


Attachment: [text/bzr-bundle] bzr/[e-mail]