diff options
author | unknown <stewart@mysql.com> | 2006-04-18 17:22:25 +1000 |
---|---|---|
committer | unknown <stewart@mysql.com> | 2006-04-18 17:22:25 +1000 |
commit | 49bd7632492daea11ab1ea4ee2a1c79d69ccda92 (patch) | |
tree | 84fefdb2d6068b7ec71ee9ef65ff2443a2d16f75 /ndb/src | |
parent | ac7ec58460b5ef6621fd77e4172bf6480ec0d3bc (diff) | |
parent | 9cc12d65cd6d57789678ce57f6ac64806d3ca56c (diff) | |
download | mariadb-git-49bd7632492daea11ab1ea4ee2a1c79d69ccda92.tar.gz |
Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18843
into mysql.com:/home/stewart/Documents/MySQL/4.1/merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
Diffstat (limited to 'ndb/src')
-rw-r--r-- | ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp index cb20fb2ca22..f9414eb8848 100644 --- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp +++ b/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() |