From: Ole John Aske
Date: February 14 2011 10:05am
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3434)
List-Archive: http://lists.mysql.com/commits/131168
Message-Id: <20110214100600.12DC6223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3533954401949267652=="

--===============3533954401949267652==
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: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;


--===============3533954401949267652==
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\
#   v4loq1784i12y407
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: cee7bd75f500219176cf3e4757501d81ca1eefb4
# timestamp: 2011-02-14 11:05:59 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSsKXwgAApv/gFAQCIBZ7///
f/f+Sr////BQBZqvZDrbbW3Naplt0ZrDJBEyGTymJlTHoakeBJp4o9J6jTT1Mg09GhAJKJomZGFC
nmpon6hpqNNDQNAAAABoCSEERqn6En6KH6mKek0AAABoAPUANBwDCMJpiGAQDIAYRpkyYRgIaCSS
TxTTAmTSaYRinkyTJiGgAAAyaB66dDTujanN/JQ4as1TS5itc9TxmEnHZ9c42DSt2shLbH1cwkQA
sOO520jeLAiIiEd/3A4shsyPmY0ToKYk1Im0Oz1bgy518Y0HHv2fNpm/lxja/PGts/Mi7WM6X4/U
Vu/PVzwhfLgpFnhrK0JF9x7qlKCblHJ7h1lbeBkOUXuWy1djHahc94rxq7vSLkW8OuNW2un3vNOx
U2zgaGkaCC9GVA6uzohBqHs6Milzlk6oWXIvLGCkBV1uGQoRUZCk8r1YuJdwxONTAkrXcRkZQQnQ
5disvSTp1ARYnGfkdVumA5r4RQoUFhV4M9KFNF8JQwQrqtw7KAJvWsIXwmAhqonDKShNH9AW3Xrj
hLrJVz1a4mEqLCszJxbcydTOqMqQS8E4OBP4ypa+AlJjOYE7Ba9yONoSEpUoBrUAKyANYV9EQsC6
KZo4TfNZpz01RhFu3co2QsjR1QuRLeGQWdgLY9cJKVuH6NVxqRFPpbkisBMOO6QxhfA/YD5KGJc1
8prSMGkrVmpGBu1FQmmAnoCwDAtgxxLyZFb88HKlTIu7sJjs81YUG343l9MWA/NJUyXAray8tHKh
ik2YiNpFiBW6XCRuMQ8C9LZjRiyyBLcQLM5Qvqs0yGZUM1klqUgLrxiV9B7TLa6hZWvh1eEtVdFd
Ypj2KZYpsmDYlRV0rNLkvbMi7i5btPKtNImPdc6bPqztWESYhWNSAm9WdRkFZY3fDxrC/QE2MbCO
XL7DRoWlF9B2JfED8ZKaoMzMm+a6ztAeGRYpQzVNAehdOdfb6JYfzuKN37lzKa6PxJgr0sGP9anU
6cAcTxJfH6EuixAiINfw4DkxMtD+EvmwSPJ6TpLRI2tyVqVrQmzqYK0HUhPwUwHOM7TNGo/7s6yB
dGwbBIFQyOv+dRaJe1iexKPDQk9HpQXyzqZMzJ8mikbKJxg2hqw+hRhXDtrfVBKgp2ECoaig+Mfz
CSC8BqMXqr82zLgZY1Ba4282QlZpqrcnSTFbHQaIdqGJORgErQL5XM0i1AQwRaU5ho34BQHWQTKP
rMlqGjL2XjbQkBNrTg14jevXixo+hbQ86tOtcZVnZHkkEILTRVYKkhNau6m7RiyMjSznXyZXJBjF
UGZE8FMduMp3lagMZeaLlUE1QfaeYyNZhIXLYKDhGP1Zh7cPNlz3qw0oo+gZpCZhWEHbMDry3g3L
uSJJMAlYnLesili52gTgwWhwCNu5DJy3hYlGADZuIpw+YTcih3bVWHQhkZwHmW49NteQh12JkpPf
XTDAQ4j2akHawadA7imczKGEgXCIdocZ31UI16xc6qW9ZJqYjhQ5E2r9VoaXtR/eVXINqBw5lc/J
v2gTxMcqFpXEnZhy+imGqKTTUU2jVoHKivXuVaEIJKHgcZN2hLIOiJgY4yvLxFNTjWyRzJMQZOZD
LbaYnNLQfe5B5VUdKYu3SgE6Io0yTGUDIgqFUn7JFZ31Znek2oLlewsMjpeoX4odgzgw3FL/GOZt
c9UwFITi0uP8HMDnoPkmC8OOZJ8L1bu0JZ09OJV1ucwHc70NmbluDK3VJOZeS/ya5bX8aHEPRFBJ
SDLc9kdeDE8VDBm+vFVLhC+mCm3FEtimgYHS7yZaQhr58GsOn2FZHqTerxUJcmYwFeqMMzAp4tkj
GHQ58IrazSBetC3keDxraqFoBwThAC3CxmA2h1WrHyinDNIsqm/4u5IpwoSBWFL4QA==


--===============3533954401949267652==--