bzr push into mysql-5.1 branch (tomas.ulin:2669 to 2670) Bug#39404

[Tomas Ulin]

 2670 Tomas Ulin	2008-09-24
      Bug #39404  	Core in NdbEventBuffer::deleteUsedEventOperations()
modified:
  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp

 2669 Jonas Oreland	2008-09-19
      ndb - bug#39549 - incorrectly handled resource shortage in TC::scanfragrec
modified:
  storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
  storage/ndb/src/ndbapi/ndberror.c

=== modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp'
--- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-06-25 12:49:13 +0000
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2008-09-24 12:27:11 +0000
@@ -1326,7 +1326,9 @@ NdbEventBuffer::nextEvent()
          {
            // moved to next gci, check if any references have been
            // released when completing the last gci
+           NdbMutex_Lock(m_mutex);
            deleteUsedEventOperations();
+           NdbMutex_Unlock(m_mutex);
            gci_ops = m_available_data.delete_next_gci_ops();
          }
          if (!gci_ops->m_consistent)
@@ -1357,12 +1359,14 @@ NdbEventBuffer::nextEvent()
   // free all "per gci unique" collected operations
   // completed gci, check if any references have been
   // released when completing the gci
+  NdbMutex_Lock(m_mutex);
   EventBufData_list::Gci_ops *gci_ops = m_available_data.first_gci_ops();
   while (gci_ops)
   {
     deleteUsedEventOperations();
     gci_ops = m_available_data.delete_next_gci_ops();
   }
+  NdbMutex_Unlock(m_mutex);
   DBUG_RETURN_EVENT(0);
 }