bzr commit into mysql-5.1-telco-7.0 branch (jonas:2939) Bug#43413

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.4/

 2939 Jonas Oreland	2009-03-13
      ndb - bug#43413 - also inform ndbcntr about nodegroup being dropped, so that ndb_mgmd shows correct information
modified:
  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2009-02-19 12:56:59 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2009-03-13 09:38:19 +0000
@@ -21433,9 +21433,10 @@ Dbdict::dropNodegroup_complete(Signal* s
 
   impl_req->requestType = DropNodegroupImplReq::RT_COMPLETE;
   dropNodegroupRecPtr.p->m_blockIndex = 0;
-  dropNodegroupRecPtr.p->m_blockCnt = 2;
+  dropNodegroupRecPtr.p->m_blockCnt = 3;
   dropNodegroupRecPtr.p->m_blockNo[0] = SUMA_REF;
   dropNodegroupRecPtr.p->m_blockNo[1] = DBDIH_REF;
+  dropNodegroupRecPtr.p->m_blockNo[2] = NDBCNTR_REF;
 
   dropNodegroup_toLocal(signal, op_ptr);
 }

=== modified file 'storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-02-24 13:00:25 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2009-03-13 09:38:19 +0000
@@ -3615,11 +3615,12 @@ Ndbcntr::execDROP_NODEGROUP_IMPL_REQ(Sig
   DropNodegroupImplReq reqCopy = *(DropNodegroupImplReq*)signal->getDataPtr();
   DropNodegroupImplReq *req = &reqCopy;
 
-  if (req->requestType == DropNodegroupImplReq::RT_COMMIT)
+  if (req->requestType == DropNodegroupImplReq::RT_COMPLETE)
   {
     jam();
     Uint32 save = c_nodeGroup;
     getNodeGroup(signal);
+    
     if (save != c_nodeGroup)
     {
       jam();