bzr push into mysql-5.1-telco-7.1 branch (jonas:3866 to 3867)

[Jonas Oreland]

 3867 Jonas Oreland	2010-10-05 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 3866 Magnus Blåudd	2010-10-05 [merge]
      Merge 7.0 -> 7.1

    modified:
      include/my_global.h
      mysql-test/suite/ndb/r/ndb_bulk_delete.result
      mysql-test/suite/ndb/t/ndb_bulk_delete.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/handler.cc
      sql/handler.h
      sql/sql_delete.cc
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-04 11:13:22 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2010-10-05 10:02:43 +0000
@@ -11449,7 +11449,7 @@ void Dbtc::sendScanFragReq(Signal* signa
     /* Short SCANFRAGREQ with separate KeyInfo and AttrInfo trains 
      * Sent to older NDBD nodes during upgrade
      */
-    ScanFragReq::setAttrLen(requestInfo, reqAttrLen);
+    ScanFragReq::setAttrLen(req->requestInfo, reqAttrLen);
     sendSignal(scanFragP->lqhBlockref, GSN_SCAN_FRAGREQ, signal,
                ScanFragReq::SignalLength, JBB);
     if(scanP->scanKeyLen > 0)

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