diff options
author | unknown <stewart@mysql.com> | 2006-04-18 17:21:54 +1000 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2006-04-18 17:21:54 +1000 |
commit | ac7ec58460b5ef6621fd77e4172bf6480ec0d3bc (patch) | |
tree | 28e1b412e4e098a5509de8c5a17ba6a56ce0c7ef | |
parent | d7055274edf92e9d1e02caa1c1f567c20cfc5463 (diff) | |
parent | 3af116f18795e8446c0baa460989be3af4512b53 (diff) | |
download | mariadb-git-ac7ec58460b5ef6621fd77e4172bf6480ec0d3bc.tar.gz |
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18833
into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
-rw-r--r-- | ndb/src/kernel/SimBlockList.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ndb/src/kernel/SimBlockList.cpp b/ndb/src/kernel/SimBlockList.cpp index 6029fc7e225..271d515dc92 100644 --- a/ndb/src/kernel/SimBlockList.cpp +++ b/ndb/src/kernel/SimBlockList.cpp @@ -111,8 +111,12 @@ SimBlockList::unload(){ if(theList != 0){ for(int i = 0; i<noOfBlocks; i++){ if(theList[i] != 0){ +#ifdef VM_TRACE theList[i]->~SimulatedBlock(); free(theList[i]); +#else + delete(theList[i]); +#endif theList[i] = 0; } } |