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

--===============0913182152682682227==
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

 3478 Ole John Aske	2011-04-14
      Minor refactoring to fix that both 'NdbImpl* const ndb' and 'NdbImpl* const impl' 
      was declared - Both referring the same NdbImpl object.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-04-06 14:16:13 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-04-14 09:28:28 +0000
@@ -2898,7 +2898,6 @@ NdbQueryImpl::closeTcCursor(bool forceSe
   assert (m_queryDef.isScanQuery());
 
   NdbImpl* const ndb = m_transaction.getNdb()->theImpl;
-  NdbImpl* const impl = ndb;
   const Uint32 timeout  = ndb->get_waitfor_timeout();
   const Uint32 nodeId   = m_transaction.getConnectedNodeId();
   const Uint32 seq      = m_transaction.theNodeSequence;
@@ -2908,7 +2907,7 @@ NdbQueryImpl::closeTcCursor(bool forceSe
    */
   PollGuard poll_guard(*ndb);
 
-  if (unlikely(impl->getNodeSequence(nodeId) != seq))
+  if (unlikely(ndb->getNodeSequence(nodeId) != seq))
   {
     setErrorCode(Err_NodeFailCausedAbort);
     return -1;  // Transporter disconnected and reconnected, no need to close
@@ -2920,7 +2919,7 @@ NdbQueryImpl::closeTcCursor(bool forceSe
     const FetchResult result = static_cast<FetchResult>
         (poll_guard.wait_scan(3*timeout, nodeId, forceSend));
 
-    if (unlikely(impl->getNodeSequence(nodeId) != seq))
+    if (unlikely(ndb->getNodeSequence(nodeId) != seq))
       setFetchTerminated(Err_NodeFailCausedAbort,false);
     else if (unlikely(result != FetchResult_ok))
     {
@@ -2955,7 +2954,7 @@ NdbQueryImpl::closeTcCursor(bool forceSe
       const FetchResult result = static_cast<FetchResult>
           (poll_guard.wait_scan(3*timeout, nodeId, forceSend));
 
-      if (unlikely(impl->getNodeSequence(nodeId) != seq))
+      if (unlikely(ndb->getNodeSequence(nodeId) != seq))
         setFetchTerminated(Err_NodeFailCausedAbort,false);
       else if (unlikely(result != FetchResult_ok))
       {


--===============0913182152682682227==
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\
#   67bic32drubmyarw
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: e13e6d7d5634a6684fe0bc9678969bf55c5bdb78
# timestamp: 2011-04-14 11:28:32 +0200
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0/
# base_revision_id: ole.john.aske@stripped\
#   d3iymdyvsdwocpjv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc1l5aUAAbRfgFAQcPP/93Iz
qAC////wUAP66zvbJx3b0d7Le8JJEEwCTymNDTSntASYRoehNNGg0iGCNomFEwQ0GjEAAAAkhEya
TTTTUynohobUGRoeoGQNANqinqGNKehH6k9AaNBDJhDRpppgCSinimU/TRR6NTZQ/SjQ0aAAADRB
l0WTfbTwJmgrvFgczAb5154lwk9MVtYIVl28sPin9vjUzMjr5o94MjUs5mbBtrdsLoXO85MHFkuB
7wauv+0R2wbw5VGXGqTQNXX+Uhjxcn+eWh41gncYzxJhpSUQOZEQ0lJ8CKzdFulFpqTlhpu+H2Z+
zdukqhjEU5hDlO4RzcJapUmsGQ7P736zrP6eyGQrt9KkAp9CnoOgvOk9MBRVTLhihxiHfDDq5TBb
jHyfwta9wWaupntjKkz85WzICBKuTLjep9KFsQGGqTY1XuENQW/LcAWhYsLs+hwnCggtqDbDcFiS
cZMLUrNe1AwrbIaaWgey2y1uxcqCMmHQNsVR3L8490K/nksShhdU61icKA3NRGBX4B2fQsxHKtg2
8545hIVQ1lt4wx0hIcCfJhTAmYRkZBilBrs2iGYIxPEWCBxuLAFeEvg4TLbECucvLFa1v4FLHT2G
eK0YmmGAxIksJl77tlNRes6zjY2Tamz3NdcOWYJwmo0yoUq3aZclfqlbLvY2ed96ujETNOyY6veG
ZO2t5E1Sg5RRhVC5GufugIrR6sbOOwIPnlxEbyid6ODqqaobXV8MZ0WC7pegjXmYnXHAM1NmjOcT
E45BXZOIu/5FdEYYpRSjVPxFeSKM2JbeHFY2mbN1oie+kRzDTOmQhQ0+FHWZIL2FGG0JvKrCrZyY
MKwD6AQBqomYKkOUP0gnKkWsvC5zY7U5CPHwx1Pu5ySiNkZzdlFNMiiiDyxfq3bcraYiDdE2djPt
qteR6EaeMJDqWp4sJVnbGOwXVcHpOKji3aV6ub5yCIb25biMucYnF5ObxaVNWbDMDiTFId9eBUi6
A7M9Ymr6fKaKz19sCy7mmUZGYoroP77354dEiZcA+k/eoKdGfoImetd5GkWq4PTp96STky9TaEoV
uCpmyWQRWIaaVqv6aaVlEVMmvFUF0TCDnHk9hgKPCXzpRxDi4tx1qZcE+peU/HfO6912blVRIsh2
TK/fpo/C1Lqrv91EemhWlozu6cFUlH1eS7BqNQjKLsWDlrv9dEMxt33WMyeRG9sIo1CHjI/CSjYs
h+nKomnhMkodTlrGRX1wT477w0jKepp7BYCdQnaT01W5CHatTlYPZKYM2RERVemiZllMZEHspLB9
/mXPoK7sC0NOshuSEje6y8xYVziB4AKQVEgpuL+QNe8m8KzkhBKceKhkp4US1yrAYUowqWIcnKMg
5RdxdyRThQkM1l5aUA==


--===============0913182152682682227==--