bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4619 to 4620)

[jonas oreland]

 4620 jonas oreland	2011-10-22
      ndb - yet another warning

    modified:
      storage/ndb/test/include/NDBT_Table.hpp
 4619 jonas oreland	2011-10-22
      ndb - kill a few warnings

    modified:
      sql/ha_ndbcluster.cc
      storage/ndb/src/ndbapi/NdbOperationExec.cpp
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
      storage/ndb/src/ndbapi/NdbTransaction.cpp
=== modified file 'storage/ndb/test/include/NDBT_Table.hpp'
--- a/storage/ndb/test/include/NDBT_Table.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/include/NDBT_Table.hpp	2011-10-22 09:47:36 +0000
@@ -93,6 +93,7 @@ public:
     // validate() might cause initialization order problem with charset
     NdbError error;
     int ret = aggregate(error);
+    (void)ret;
     assert(ret == 0);
   }
   

No bundle (reason: useless for push emails).