From: Ole John Aske
Date: February 14 2011 9:57am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3432)
List-Archive: http://lists.mysql.com/commits/131167
Message-Id: <20110214095705.24ED1223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7295619345404368413=="

--===============7295619345404368413==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 3432 Ole John Aske	2011-02-14
      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 09:56:59 +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-08 12:14:41 +0000
+++ b/storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp	2011-02-14 09:56:59 +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, 
@@ -5256,8 +5256,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;


--===============7295619345404368413==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   0rb2hzdafg22dyzu
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: 06ad6ad8709e9550ef12ca34ee28148ed35f31e9
# timestamp: 2011-02-14 10:57:05 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   zfb58opd4zlnnf5z
# 
# Begin bundle
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
ckU4UJCn4Tmu


--===============7295619345404368413==--