diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-04-25 17:02:49 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-04-25 17:02:49 +0200 |
| commit | b4999513d127d6918fcc576c5393875e5b102d42 (patch) | |
| tree | 87004ffbe313f402b2833c8cbfa0442ff15717ce /storage | |
| parent | b784da04340daebef94158a0ba96667247af6dd5 (diff) | |
| parent | ea564a7215b7267855892b3ef40898821d688ba5 (diff) | |
| download | mariadb-git-b4999513d127d6918fcc576c5393875e5b102d42.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/src/kernel/SimBlockList.cpp | 4 | ||||
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/SimBlockList.cpp b/storage/ndb/src/kernel/SimBlockList.cpp index 00ec5e4b006..ef9897a77ea 100644 --- a/storage/ndb/src/kernel/SimBlockList.cpp +++ b/storage/ndb/src/kernel/SimBlockList.cpp @@ -120,8 +120,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; } } diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp index ed37622657d..e38c82c634f 100644 --- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp +++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp @@ -25,7 +25,10 @@ void Ndbcntr::initData() { - + c_start.reset(); + cmasterNodeId = 0; + cnoStartNodes = 0; + cnoWaitrep = 0; // Records with constant sizes ndbBlocksRec = new NdbBlocksRec[ZSIZE_NDB_BLOCKS_REC]; }//Ndbcntr::initData() |