bk commit into 5.1 tree (jonas:1.2355)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2355 06/04/26 15:16:21 jonas@stripped +5 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/51-work

  storage/ndb/src/mgmsrv/Services.cpp
    1.62 06/04/26 15:16:17 jonas@stripped +0 -3
    Auto merged

  storage/ndb/src/common/util/SocketServer.cpp
    1.20 06/04/26 15:16:17 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/common/transporter/Transporter.cpp
    1.23 06/04/26 15:16:17 jonas@stripped +0 -6
    Auto merged

  storage/ndb/include/util/SocketServer.hpp
    1.11 06/04/26 15:16:17 jonas@stripped +0 -0
    Auto merged

  support-files/mysql.spec.sh
    1.139 06/04/26 15:16:17 jonas@stripped +0 -0
    Auto merged

  storage/ndb/src/mgmsrv/Services.cpp
    1.45.16.2 06/04/26 15:16:17 jonas@stripped +0 -0
    Merge rename: ndb/src/mgmsrv/Services.cpp -> storage/ndb/src/mgmsrv/Services.cpp

  storage/ndb/src/common/util/SocketServer.cpp
    1.15.4.2 06/04/26 15:16:17 jonas@stripped +0 -0
    Merge rename: ndb/src/common/util/SocketServer.cpp -> storage/ndb/src/common/util/SocketServer.cpp

  storage/ndb/src/common/transporter/Transporter.cpp
    1.18.3.2 06/04/26 15:16:17 jonas@stripped +0 -0
    Merge rename: ndb/src/common/transporter/Transporter.cpp -> storage/ndb/src/common/transporter/Transporter.cpp

  storage/ndb/include/util/SocketServer.hpp
    1.6.3.2 06/04/26 15:16:17 jonas@stripped +0 -0
    Merge rename: ndb/include/util/SocketServer.hpp -> storage/ndb/include/util/SocketServer.hpp

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work/RESYNC

--- 1.138/support-files/mysql.spec.sh	2006-04-13 22:08:33 +02:00
+++ 1.139/support-files/mysql.spec.sh	2006-04-26 15:16:17 +02:00
@@ -641,6 +641,7 @@
 %attr(755, root, root) %{_bindir}/ndb_desc
 %attr(755, root, root) %{_bindir}/ndb_show_tables
 %attr(755, root, root) %{_bindir}/ndb_test_platform
+%attr(755, root, root) %{_bindir}/ndb_config
 
 %files ndb-extra
 %defattr(-,root,root,0755)

--- 1.6.3.1/ndb/include/util/SocketServer.hpp	2006-04-26 15:13:40 +02:00
+++ 1.11/storage/ndb/include/util/SocketServer.hpp	2006-04-26 15:16:17 +02:00
@@ -60,6 +60,7 @@
    */
   class Service {
   public:
+    Service() {}
     virtual ~Service(){}
     
     /**

--- 1.45.16.1/ndb/src/mgmsrv/Services.cpp	2006-04-26 15:13:40 +02:00
+++ 1.62/storage/ndb/src/mgmsrv/Services.cpp	2006-04-26 15:16:17 +02:00
@@ -866,14 +866,11 @@
   }
 
   int restarted = 0;
-  int result = 0;
-
-  for(size_t i = 0; i < nodes.size(); i++)
-    if((result = m_mgmsrv.restartNode(nodes[i],
-				      nostart != 0,
-				      initialstart != 0,
-				      abort != 0)) == 0)
-      restarted++;
+  int result= m_mgmsrv.restartNodes(nodes,
+                                    &restarted,
+                                    nostart != 0,
+                                    initialstart != 0,
+                                    abort != 0);
   
   m_output->println("restart reply");
   if(result != 0){
@@ -998,7 +995,12 @@
 
   args.get("node", (const char **)&nodes_str);
   if(nodes_str == NULL)
+  {
+    m_output->println("stop reply");
+    m_output->println("result: empty node list");
+    m_output->println("");
     return;
+  }
   args.get("abort", &abort);
 
   char *p, *last;
@@ -1008,29 +1010,10 @@
     nodes.push_back(atoi(p));
   }
 
-  int stop_self= 0;
-  size_t i;
-
-  for(i=0; i < nodes.size(); i++) {
-    if (nodes[i] == m_mgmsrv.getOwnNodeId()) {
-      stop_self= 1;
-      if (i != nodes.size()-1) {
-	m_output->println("stop reply");
-	m_output->println("result: server must be stopped last");
-	m_output->println("");
-	return;
-      }
-    }
-  }
-
-  int stopped = 0, result = 0;
-  
-  for(i=0; i < nodes.size(); i++)
-    if (nodes[i] != m_mgmsrv.getOwnNodeId()) {
-      if((result = m_mgmsrv.stopNode(nodes[i], abort != 0)) == 0)
-	stopped++;
-    } else
-      stopped++;
+  int stopped= 0;
+  int result= 0;
+  if (nodes.size())
+    result= m_mgmsrv.stopNodes(nodes, &stopped, abort != 0);
 
   m_output->println("stop reply");
   if(result != 0)
@@ -1039,9 +1022,6 @@
     m_output->println("result: Ok");
   m_output->println("stopped: %d", stopped);
   m_output->println("");
-
-  if (stop_self)
-    g_StopServer= true;
 }