bzr push into mysql-5.1-telco-7.1 branch (frazer:2947 to 2948)

[Frazer Clement]

 2948 Frazer Clement	2009-08-05
      Fix issue with TC scanning fragments stored in older version nodes
      modified:
        storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

 2947 Jonas Oreland	2009-08-05 [merge]
      merge 70 to 71
      modified:
        storage/ndb/include/kernel/signaldata/CreateHashMap.hpp
        storage/ndb/include/kernel/signaldata/CreateTable.hpp
        storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
        storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
        storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
        storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
        storage/ndb/src/kernel/blocks/suma/Suma.cpp
        storage/ndb/src/ndbapi/NdbDictionary.cpp
        storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
        storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
        storage/ndb/src/ndbapi/ndberror.c
        storage/ndb/test/include/AtrtClient.hpp
        storage/ndb/test/include/NDBT_Test.hpp
        storage/ndb/test/ndbapi/testUpgrade.cpp
        storage/ndb/test/run-test/command.cpp
        storage/ndb/test/run-test/db.cpp
        storage/ndb/test/run-test/setup.cpp
        storage/ndb/test/src/AtrtClient.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2009-08-04 11:38:05 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2009-08-05 12:51:46 +0000
@@ -10586,7 +10586,10 @@ void Dbtc::sendScanFragReq(Signal* signa
   Uint32 reqAttrLen= 0;
   if (unlikely(! longFragReq))
   {
-    reqKeyLen= getSectionSz(scanP->scanKeyIVal);
+    jam();
+    ndbassert(scanP->scanAttrIVal != RNIL);
+    reqKeyLen= (scanP->scanKeyIVal == RNIL)? 0 :
+      getSectionSz(scanP->scanKeyIVal);
     reqAttrLen= getSectionSz(scanP->scanAttrIVal);;
   }
   ScanFragReq * const req = (ScanFragReq *)&signal->theData[0];