From: Jonas Oreland
Date: June 27 2011 6:24am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jonas.oreland:4473) Bug#61607
List-Archive: http://lists.mysql.com/commits/139874
X-Bug: 61607
Message-Id: <20110627062444.C5B659E4FF2@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5436764808309572445=="

--===============5436764808309572445==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4473 Jonas Oreland	2011-06-27
      ndb - bug#61607 - don't count down nodes as failed in shutdown

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/test/ndbapi/testMgmd.cpp
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-21 14:12:16 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-06-27 06:24:29 +0000
@@ -1081,10 +1081,6 @@ MgmtSrvr::sendall_STOP_REQ(NodeBitmask &
         else
           failed++;
       }
-      else
-      {
-        failed++;
-      }
     }
   }
 

=== modified file 'storage/ndb/test/ndbapi/testMgmd.cpp'
--- a/storage/ndb/test/ndbapi/testMgmd.cpp	2011-06-21 13:10:37 +0000
+++ b/storage/ndb/test/ndbapi/testMgmd.cpp	2011-06-27 06:24:29 +0000
@@ -280,6 +280,8 @@ public:
 
   }
 
+  NdbMgmHandle handle() { return m_mgmd_client.handle(); }
+
 private:
 
   bool get_section_string(const Properties& config,
@@ -1099,6 +1101,55 @@ int runTestBug12352191(NDBT_Context* ctx
 
 }
 
+int
+runBug61607(NDBT_Context* ctx, NDBT_Step* step)
+{
+  NDBT_Workingdir wd("test_mgmd"); // temporary working directory
+
+  // Create config.ini
+  const int cnt_mgmd = 1;
+  Properties config = ConfigFactory::create(cnt_mgmd);
+  CHECK(ConfigFactory::write_config_ini(config,
+                                        path(wd.path(),
+                                             "config.ini",
+                                             NULL).c_str()));
+  // Start ndb_mgmd(s)
+  MgmdProcessList mgmds;
+  for (int i = 1; i <= cnt_mgmd; i++)
+  {
+    Mgmd* mgmd = new Mgmd(i);
+    mgmds.push_back(mgmd);
+    CHECK(mgmd->start_from_config_ini(wd.path()));
+  }
+
+  // Connect the ndb_mgmd(s)
+  for (unsigned i = 0; i < mgmds.size(); i++)
+    CHECK(mgmds[i]->connect(config));
+
+  // wait for confirmed config
+  for (unsigned i = 0; i < mgmds.size(); i++)
+    CHECK(mgmds[i]->wait_confirmed_config());
+
+  // Check binary config files created
+  CHECK(file_exists(path(wd.path(),
+                         "ndb_1_config.bin.1",
+                         NULL).c_str()));
+
+  int no_of_nodes = 0;
+  int * node_ids = 0;
+  int initialstart = 0;
+  int nostart = 0;
+  int abort = 0;
+  int force = 0;
+  int need_disconnect = 0;
+  int res = ndb_mgm_restart4(mgmds[0]->handle(), no_of_nodes, node_ids,
+                             initialstart, nostart, abort, force,
+                             &need_disconnect);
+
+
+  return res == 0 ? NDBT_OK : NDBT_FAILED;
+}
+
 NDBT_TESTSUITE(testMgmd);
 DRIVER(DummyDriver); /* turn off use of NdbApi */
 
@@ -1151,6 +1202,10 @@ TESTCASE("Bug12352191",
 {
   INITIALIZER(runTestBug12352191);
 }
+TESTCASE("Bug61607", "")
+{
+  INITIALIZER(runBug61607);
+}
 
 NDBT_TESTSUITE_END(testMgmd);
 


--===============5436764808309572445==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonas.oreland@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas.oreland@stripped\
#   dy73fhubzaxw9d4m
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 8f60af2b6ef9fd7b2fbebdeb6b49a276eacaa608
# timestamp: 2011-06-27 08:24:44 +0200
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
gfH+SA==


--===============5436764808309572445==--