summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorstewart@mysql.com <>2006-04-18 17:21:54 +1000
committerstewart@mysql.com <>2006-04-18 17:21:54 +1000
commit4e092ed74f772b6aa04ae008b64c18eeba8e9c92 (patch)
tree28e1b412e4e098a5509de8c5a17ba6a56ce0c7ef /ndb
parentbc1f457194b0b28a16b69f1a367ea66462a4608c (diff)
parentadd2732f78dc43e9f3a507af641b43526139767d (diff)
downloadmariadb-git-4e092ed74f772b6aa04ae008b64c18eeba8e9c92.tar.gz
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18833
into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/SimBlockList.cpp4
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;
}
}