diff options
| author | unknown <tomas@poseidon.(none)> | 2004-09-06 10:46:23 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.(none)> | 2004-09-06 10:46:23 +0000 |
| commit | d0f78a9cc189ad0b09c468a875d0024b7ddee48e (patch) | |
| tree | 874de12f90ef63794c116b4bd05e7562e99b5c3b /ndb/src/ndbapi/ObjectMap.hpp | |
| parent | e36253d6931c53aee45ab5c6c7f73e6596d8fcc3 (diff) | |
| download | mariadb-git-d0f78a9cc189ad0b09c468a875d0024b7ddee48e.tar.gz | |
added ndb_mgm_destroy_configuration call
fixed memory leak in object map
fixed uninitialized value blobs_pending
ndb/include/mgmapi/mgmapi.h:
added ndb_mgm_destroy_configuration call
ndb/src/mgmapi/mgmapi.cpp:
added ndb_mgm_destroy_configuration call
ndb/src/ndbapi/ObjectMap.hpp:
fixed memory leak
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added ndb_mgm_destroy_configuration call
sql/ha_ndbcluster.cc:
fixed uninitialized value blobs_pending
Diffstat (limited to 'ndb/src/ndbapi/ObjectMap.hpp')
| -rw-r--r-- | ndb/src/ndbapi/ObjectMap.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ndb/src/ndbapi/ObjectMap.hpp b/ndb/src/ndbapi/ObjectMap.hpp index f67774bb413..6c984c644e2 100644 --- a/ndb/src/ndbapi/ObjectMap.hpp +++ b/ndb/src/ndbapi/ObjectMap.hpp @@ -134,7 +134,10 @@ NdbObjectIdMap::expand(Uint32 incSize){ Uint32 newSize = m_size + incSize; MapEntry * tmp = (MapEntry*)malloc(newSize * sizeof(MapEntry)); - memcpy(tmp, m_map, m_size * sizeof(MapEntry)); + if (m_map) { + memcpy(tmp, m_map, m_size * sizeof(MapEntry)); + free((void*)m_map); + } m_map = tmp; for(Uint32 i = m_size; i<newSize; i++){ |