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

[jonas oreland]

 4494 jonas oreland	2011-07-01
      ndb - fix valgrind warning in NdbQueryOperation

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
 4493 jonas oreland	2011-07-01
      ndb - fix compiler warning introduced by changes in settings

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-06-30 08:27:52 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2011-07-01 10:02:15 +0000
@@ -507,7 +507,7 @@ void NdbBulkAllocator::reset(){
   // Overwrite with 0xff bytes to detect accidental use of released memory.
   assert(m_buffer == NULL || 
          memset(m_buffer, 0xff, m_maxObjs * m_objSize) != NULL);
-  delete m_buffer;
+  delete [] m_buffer;
   m_buffer = NULL;
   m_nextObjNo = 0;
   m_maxObjs = 0;

No bundle (reason: useless for push emails).