bzr commit into mysql-5.1-telco-6.3 branch (jonas:3380)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3380 Jonas Oreland	2011-01-17
      ndb - bump version to 6.3.41

    modified:
      configure.in
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
=== modified file 'configure.in'
--- a/configure.in	2010-11-03 12:16:29 +0000
+++ b/configure.in	2011-01-17 12:52:14 +0000
@@ -15,7 +15,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.51-ndb-6.3.40], [], [mysql])
+AC_INIT([MySQL Server], [5.1.51-ndb-6.3.41], [], [mysql])
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM
 # USTAR format gives us the possibility to store longer path names in
@@ -34,7 +34,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R
 
 NDB_VERSION_MAJOR=6
 NDB_VERSION_MINOR=3
-NDB_VERSION_BUILD=40
+NDB_VERSION_BUILD=41
 NDB_VERSION_STATUS="-GA"
 
 PROTOCOL_VERSION=10

=== modified file 'storage/ndb/src/ndbapi/NdbScanOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2011-01-03 10:56:37 +0000
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2011-01-17 12:52:14 +0000
@@ -2517,8 +2517,19 @@ NdbScanOperation::takeOverScanOp(Operati
   default:
     newOp->theStatus = SetValue;
   }
+
   const Uint32 tScanInfo = infoword & 0x3FFFF;
   const Uint32 tTakeOverFragment = infoword >> 20;
+
+  if (pTrans == m_transConnection)
+  {
+    /**
+     * No point in setting scan-take-over, when taking over to own trans
+     */
+    newOp->theScanInfo = 0;
+    newOp->theDistrKeyIndicator_ = 1;
+  }
+  else
   {
     UintR scanInfo = 0;
     TcKeyReq::setTakeOverScanFlag(scanInfo, 1);
@@ -2634,14 +2645,26 @@ NdbScanOperation::takeOverScanOpNdbRecor
   res= receiver->get_keyinfo20(infoword, op->m_keyinfo_length, op->m_key_row);
   if (res==-1)
     return NULL;
-  Uint32 scanInfo= 0;
-  TcKeyReq::setTakeOverScanFlag(scanInfo, 1);
-  Uint32 fragment= infoword >> 20;
-  TcKeyReq::setTakeOverScanFragment(scanInfo, fragment);
-  TcKeyReq::setTakeOverScanInfo(scanInfo, infoword & 0x3FFFF);
-  op->theScanInfo= scanInfo;
-  op->theDistrKeyIndicator_= 1;
-  op->theDistributionKey= fragment;
+
+  if (pTrans == m_transConnection)
+  {
+    /**
+     * No point in setting scan-take-over, when taking over to own trans
+     */
+    op->theScanInfo = 0;
+    op->theDistrKeyIndicator_ = 0;
+  }
+  else
+  {
+    Uint32 scanInfo= 0;
+    Uint32 fragment= infoword >> 20;
+    TcKeyReq::setTakeOverScanFlag(scanInfo, 1);
+    TcKeyReq::setTakeOverScanFragment(scanInfo, fragment);
+    TcKeyReq::setTakeOverScanInfo(scanInfo, infoword & 0x3FFFF);
+    op->theScanInfo= scanInfo;
+    op->theDistrKeyIndicator_= 1;
+    op->theDistributionKey= fragment;
+  }
 
   op->m_attribute_row= row;
   record->copyMask(op->m_read_mask, mask);


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