bk commit into 4.1 tree (jonas:1.2455) BUG#13078

[jonas]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2455 05/10/27 17:14:17 jonas@stripped +3 -0
  bug#13078 - ndb
       memleak when doing ordered index scan on index with column larger than 32 bytes
       (recommit for merge to 5.0)

  ndb/src/ndbapi/ndb_cluster_connection.cpp
    1.19 05/10/27 17:14:14 jonas@stripped +13 -0
    Destroy mutexes

  ndb/src/ndbapi/NdbRecAttr.cpp
    1.15 05/10/27 17:14:14 jonas@stripped +4 -0
     Dont allocate theStorageX twice

  ndb/src/ndbapi/NdbImpl.hpp
    1.8 05/10/27 17:14:14 jonas@stripped +6 -4
     Fix order of free lists so that destructors are run in correct order

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1

--- 1.7/ndb/src/ndbapi/NdbImpl.hpp	2005-09-16 11:26:31 +02:00
+++ 1.8/ndb/src/ndbapi/NdbImpl.hpp	2005-10-27 17:14:14 +02:00
@@ -78,11 +78,9 @@
   /**
    * NOTE free lists must be _after_ theNdbObjectIdMap take
    *   assure that destructors are run in correct order
+   * NOTE these has to be in this specific order to make destructor run in
+   *      correct order
    */
-  Ndb_free_list_t<NdbConnection> theConIdleList; 
-  Ndb_free_list_t<NdbOperation>  theOpIdleList;  
-  Ndb_free_list_t<NdbIndexScanOperation> theScanOpIdleList;
-  Ndb_free_list_t<NdbIndexOperation> theIndexOpIdleList;
   Ndb_free_list_t<NdbRecAttr> theRecAttrIdleList;  
   Ndb_free_list_t<NdbApiSignal> theSignalIdleList;
   Ndb_free_list_t<NdbLabel> theLabelList;
@@ -91,6 +89,10 @@
   Ndb_free_list_t<NdbCall> theCallList;
   Ndb_free_list_t<NdbBlob> theNdbBlobIdleList;
   Ndb_free_list_t<NdbReceiver> theScanList;
+  Ndb_free_list_t<NdbIndexScanOperation> theScanOpIdleList;
+  Ndb_free_list_t<NdbOperation>  theOpIdleList;  
+  Ndb_free_list_t<NdbIndexOperation> theIndexOpIdleList;
+  Ndb_free_list_t<NdbConnection> theConIdleList; 
 };
 
 #ifdef VM_TRACE

--- 1.14/ndb/src/ndbapi/NdbRecAttr.cpp	2005-09-16 11:26:31 +02:00
+++ 1.15/ndb/src/ndbapi/NdbRecAttr.cpp	2005-10-27 17:14:14 +02:00
@@ -35,6 +35,7 @@
 
 NdbRecAttr::NdbRecAttr(Ndb*)
 {
+  theStorageX = 0;
   init();
 }
 
@@ -63,6 +64,9 @@
   theValue = aValue;
   theNULLind = 0;
   m_nullable = anAttrInfo->m_nullable;
+
+  if (theStorageX)
+    delete[] theStorageX;
 
   // check alignment to signal data
   // a future version could check alignment per data type as well

--- 1.18/ndb/src/ndbapi/ndb_cluster_connection.cpp	2005-02-24 18:59:55 +01:00
+++ 1.19/ndb/src/ndbapi/ndb_cluster_connection.cpp	2005-10-27 17:14:14 +02:00
@@ -308,6 +308,19 @@
 
   //  fragmentToNodeMap.release();
 
+  if (ndb_global_event_buffer_mutex != NULL)
+  {
+    NdbMutex_Destroy(ndb_global_event_buffer_mutex);
+    ndb_global_event_buffer_mutex= NULL;
+  }
+#ifdef VM_TRACE
+  if (ndb_print_state_mutex != NULL)
+  {
+    NdbMutex_Destroy(ndb_print_state_mutex);
+    ndb_print_state_mutex= NULL;
+  }
+#endif
+
   DBUG_VOID_RETURN;
 }