bzr commit into mysql-5.1-telco-6.3 branch (jonas:3427)

[jonas oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:frazer.clement@stripped

 3427 jonas oreland	2011-04-15
      ndb - add warning printouts in destroying things in wrong order

    modified:
      storage/ndb/src/ndbapi/Ndbinit.cpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
=== modified file 'storage/ndb/src/ndbapi/Ndbinit.cpp'
--- a/storage/ndb/src/ndbapi/Ndbinit.cpp	2011-04-13 17:06:44 +0000
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp	2011-04-15 06:21:46 +0000
@@ -141,6 +141,19 @@ Ndb::~Ndb()
   if (m_sys_tab_0)
     getDictionary()->removeTableGlobal(*m_sys_tab_0, 0);
 
+  if (theImpl->m_ev_op != 0)
+  {
+    g_eventLogger->warning("Deleting Ndb-object with NdbEventOperation still"
+                           " active");
+    printf("this: %p NdbEventOperation(s): ", this);
+    for (NdbEventOperationImpl *op= theImpl->m_ev_op; op; op=op->m_next)
+    {
+      printf("%p ", op);
+    }
+    printf("\n");
+    fflush(stdout);
+  }
+
   assert(theImpl->m_ev_op == 0); // user should return NdbEventOperation's
   for (NdbEventOperationImpl *op= theImpl->m_ev_op; op; op=op->m_next)
   {

=== modified file 'storage/ndb/src/ndbapi/ndb_cluster_connection.cpp'
--- a/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2011-02-01 21:05:11 +0000
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2011-04-15 06:21:46 +0000
@@ -390,6 +390,22 @@ Ndb_cluster_connection_impl(const char *
 Ndb_cluster_connection_impl::~Ndb_cluster_connection_impl()
 {
   DBUG_ENTER("~Ndb_cluster_connection");
+
+  if (m_first_ndb_object != 0)
+  {
+    g_eventLogger->warning("Deleting Ndb_cluster_connection with Ndb-object"
+                           " not deleted");
+    Ndb * p = m_first_ndb_object;
+    printf("this: %p Ndb-object(s): ", (Ndb_cluster_connection*)this);
+    while (p)
+    {
+      printf("%p ", p);
+      p = p->theImpl->m_next_ndb_object;
+    }
+    printf("\n");
+    fflush(stdout);
+  }
+
   if (m_transporter_facade != 0)
   {
     m_transporter_facade->stop_instance();


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