bzr push into mysql-5.1-telco-6.2 branch (jonas:3021 to 3022)

[Jonas Oreland]

 3022 Jonas Oreland	2009-10-20
      ndb - fix newly introduced compiler warnings

    modified:
      storage/ndb/test/ndbapi/testBasic.cpp
 3021 Jonas Oreland	2009-10-20
      ndb - bug#48037
        Fix various abort cases with indexes that could in worst case 
          cause node-failure

    modified:
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
      storage/ndb/test/ndbapi/testBasic.cpp
=== modified file 'storage/ndb/test/ndbapi/testBasic.cpp'
--- a/storage/ndb/test/ndbapi/testBasic.cpp	2009-10-20 12:10:49 +0000
+++ b/storage/ndb/test/ndbapi/testBasic.cpp	2009-10-20 12:44:56 +0000
@@ -1146,7 +1146,7 @@ runTupErrors(NDBT_Context* ctx, NDBT_Ste
 
   NdbDictionary::Dictionary::List l;
   pNdb->getDictionary()->listIndexes(l, tab->getName());
-  for (i = 0; i<(int)l.count; i++)
+  for (i = 0; i<l.count; i++)
   {
     if (DictTabInfo::isOrderedIndex(l.elements[i].type))
       bits |= TupError::TE_OI;
@@ -1502,7 +1502,7 @@ runBug20535(NDBT_Context* ctx, NDBT_Step
   NdbDictionary::Dictionary * dict = pNdb->getDictionary();
 
   bool null = false;
-  for (i = 0; i<tab->getNoOfColumns(); i++)
+  for (i = 0; i<(Uint32)tab->getNoOfColumns(); i++)
   {
     if (tab->getColumn(i)->getNullable())
     {
@@ -1527,7 +1527,7 @@ runBug20535(NDBT_Context* ctx, NDBT_Step
   pOp = pTrans->getNdbOperation(tab->getName());
   pOp->insertTuple();
   hugoTrans.equalForRow(pOp, 0);
-  for (i = 0; i<tab->getNoOfColumns(); i++)
+  for (i = 0; i<(Uint32)tab->getNoOfColumns(); i++)
   {
     if (!tab->getColumn(i)->getPrimaryKey() &&
         !tab->getColumn(i)->getNullable())
@@ -1546,7 +1546,7 @@ runBug20535(NDBT_Context* ctx, NDBT_Step
   pOp->readTuple();
   hugoTrans.equalForRow(pOp, 0);
   Vector<NdbRecAttr*> values;
-  for (i = 0; i<tab->getNoOfColumns(); i++)
+  for (i = 0; i<(Uint32)tab->getNoOfColumns(); i++)
   {
     if (!tab->getColumn(i)->getPrimaryKey() &&
         tab->getColumn(i)->getNullable())


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