bzr push into mysql-5.1-telco-7.0 branch (jonas:3835 to 3836)

[Jonas Oreland]

 3836 Jonas Oreland	2010-10-06
      ndb - bah, broken index-scan when fixing the long/short handling

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 3835 Jonas Oreland	2010-10-06 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/src/ndbapi/Ndbif.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-06 07:14:56 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-06 09:19:14 +0000
@@ -11385,7 +11385,7 @@ void Dbtc::sendScanFragReq(Signal* signa
   ptrCheckGuard(apiConnectptr, capiConnectFilesize, apiConnectRecord);
   req->senderData = scanFragptr.i;
   req->requestInfo = requestInfo;
-  req->fragmentNoKeyLen = scanFragP->scanFragId | reqKeyLen;
+  req->fragmentNoKeyLen = scanFragP->scanFragId;
   req->resultRef = apiConnectptr.p->ndbapiBlockref;
   req->savePointId = apiConnectptr.p->currSavePointId;
   req->transId1 = apiConnectptr.p->transid[0];
@@ -11447,6 +11447,7 @@ void Dbtc::sendScanFragReq(Signal* signa
      */
     Uint32 reqAttrLen = sections.m_ptr[0].sz;
     ScanFragReq::setAttrLen(req->requestInfo, reqAttrLen);
+    req->fragmentNoKeyLen |= reqKeyLen;
     sendSignal(scanFragP->lqhBlockref, GSN_SCAN_FRAGREQ, signal,
                ScanFragReq::SignalLength, JBB);
     if(reqKeyLen > 0)


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