bzr push into mysql-5.1-telco-7.0 branch (jonas:4068 to 4069)

[Jonas Oreland]

 4069 Jonas Oreland	2010-12-20
      ndb - fix assert in debug, (foudn by testNdbApi -n Bug44065) due using incorrect lock()-method

    modified:
      storage/ndb/src/ndbapi/Ndbif.cpp
 4068 Jonas Oreland	2010-12-20
      ndb - bug#58945 - handle DiskPageBufferMemory the same as all other memory

    modified:
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
      storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
      storage/ndb/src/kernel/blocks/record_types.hpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
=== modified file 'storage/ndb/src/ndbapi/Ndbif.cpp'
--- a/storage/ndb/src/ndbapi/Ndbif.cpp	2010-12-18 08:36:08 +0000
+++ b/storage/ndb/src/ndbapi/Ndbif.cpp	2010-12-20 12:54:39 +0000
@@ -1251,9 +1251,9 @@ Remark:   First send all prepared operat
 void	
 Ndb::sendPreparedTransactions(int forceSend)
 {
-  theImpl->m_transporter_facade->lock_mutex();
+  theImpl->lock();
   sendPrepTrans(forceSend);
-  theImpl->m_transporter_facade->unlock_mutex();
+  theImpl->unlock();
   return;
 }//Ndb::sendPreparedTransactions()
 

No bundle (reason: useless for push emails).