bk commit into 5.1 tree (jonas:1.2262)

[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@stripped, 2006-08-07 12:12:55+02:00, jonas@stripped +4 -0
  ndb - some hugo updates
    make dump state args list const
    make node lists const

  storage/ndb/include/mgmapi/mgmapi_debug.h@stripped, 2006-08-07 12:12:53+02:00, jonas@stripped +1 -1
    make dump state args list const

  storage/ndb/src/mgmapi/mgmapi.cpp@stripped, 2006-08-07 12:12:53+02:00, jonas@stripped +1 -1
    make dump state args list const

  storage/ndb/test/include/NdbRestarter.hpp@stripped, 2006-08-07 12:12:53+02:00, jonas@stripped +7 -7
    make node lists const

  storage/ndb/test/src/NdbRestarter.cpp@stripped, 2006-08-07 12:12:53+02:00, jonas@stripped +8 -8
    make node lists const

# 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

--- 1.8/storage/ndb/include/mgmapi/mgmapi_debug.h	2006-08-07 12:13:00 +02:00
+++ 1.9/storage/ndb/include/mgmapi/mgmapi_debug.h	2006-08-07 12:13:00 +02:00
@@ -101,7 +101,7 @@
    */
   int ndb_mgm_dump_state(NdbMgmHandle handle,
 			 int nodeId,
-			 int * args,
+			 const int * args,
 			 int num_args,
 			 struct ndb_mgm_reply* reply);
     

--- 1.67/storage/ndb/src/mgmapi/mgmapi.cpp	2006-08-07 12:13:00 +02:00
+++ 1.68/storage/ndb/src/mgmapi/mgmapi.cpp	2006-08-07 12:13:00 +02:00
@@ -1442,7 +1442,7 @@
 
 extern "C"
 int 
-ndb_mgm_dump_state(NdbMgmHandle handle, int nodeId, int* _args,
+ndb_mgm_dump_state(NdbMgmHandle handle, int nodeId, const int * _args,
 		   int _num_args, struct ndb_mgm_reply* /* reply */) 
 {
   SET_ERROR(handle, NDB_MGM_NO_ERROR, "Executing: ndb_mgm_dump_state");

--- 1.8/storage/ndb/test/include/NdbRestarter.hpp	2006-08-07 12:13:00 +02:00
+++ 1.9/storage/ndb/test/include/NdbRestarter.hpp	2006-08-07 12:13:00 +02:00
@@ -38,16 +38,16 @@
 		 bool abort = false);
   
   int startAll();
-  int startNodes(int * _nodes, int _num_nodes);
+  int startNodes(const int * _nodes, int _num_nodes);
   int waitClusterStarted(unsigned int _timeout = 120);
   int waitClusterSingleUser(unsigned int _timeout = 120);
   int waitClusterStartPhase(int _startphase, unsigned int _timeout = 120);
   int waitClusterNoStart(unsigned int _timeout = 120);  
-  int waitNodesStarted(int * _nodes, int _num_nodes,
+  int waitNodesStarted(const int * _nodes, int _num_nodes,
 		       unsigned int _timeout = 120);
-  int waitNodesStartPhase(int * _nodes, int _num_nodes, 
+  int waitNodesStartPhase(const int * _nodes, int _num_nodes, 
 			  int _startphase, unsigned int _timeout = 120);
-  int waitNodesNoStart(int * _nodes, int _num_nodes,
+  int waitNodesNoStart(const int * _nodes, int _num_nodes,
 		       unsigned int _timeout = 120); 
 
 
@@ -58,8 +58,8 @@
   int enterSingleUserMode(int _nodeId);
   int exitSingleUserMode();
 
-  int dumpStateOneNode(int _nodeId, int * _args, int _num_args);
-  int dumpStateAllNodes(int * _args, int _num_args);
+  int dumpStateOneNode(int _nodeId, const int * _args, int _num_args);
+  int dumpStateAllNodes(const int * _args, int _num_args);
 
   int getMasterNodeId();
   int getRandomNodeSameNodeGroup(int nodeId, int randomNumber);
@@ -74,7 +74,7 @@
 		       unsigned int _timeout,
 		       int _startphase = -1);  
 
-  int waitNodesState(int * _nodes, int _num_nodes,
+  int waitNodesState(const int * _nodes, int _num_nodes,
 		     ndb_mgm_node_status _status,
 		     unsigned int _timeout,
 		     int _startphase = -1);

--- 1.14/storage/ndb/test/src/NdbRestarter.cpp	2006-08-07 12:13:00 +02:00
+++ 1.15/storage/ndb/test/src/NdbRestarter.cpp	2006-08-07 12:13:00 +02:00
@@ -249,7 +249,7 @@
  
 
 int 
-NdbRestarter::waitNodesState(int * _nodes, int _num_nodes,
+NdbRestarter::waitNodesState(const int * _nodes, int _num_nodes,
 			     ndb_mgm_node_status _status,
 			     unsigned int _timeout,
 			     int _startphase){
@@ -367,20 +367,20 @@
   return 0;
 }
 
-int NdbRestarter::waitNodesStarted(int * _nodes, int _num_nodes,
+int NdbRestarter::waitNodesStarted(const int * _nodes, int _num_nodes,
 		     unsigned int _timeout){
   return waitNodesState(_nodes, _num_nodes, 
-			  NDB_MGM_NODE_STATUS_STARTED, _timeout);  
+			NDB_MGM_NODE_STATUS_STARTED, _timeout);  
 }
 
-int NdbRestarter::waitNodesStartPhase(int * _nodes, int _num_nodes, 
+int NdbRestarter::waitNodesStartPhase(const int * _nodes, int _num_nodes, 
 			int _startphase, unsigned int _timeout){
   return waitNodesState(_nodes, _num_nodes, 
 			  NDB_MGM_NODE_STATUS_STARTING, _timeout,
 			  _startphase);  
 }
 
-int NdbRestarter::waitNodesNoStart(int * _nodes, int _num_nodes,
+int NdbRestarter::waitNodesNoStart(const int * _nodes, int _num_nodes,
 		     unsigned int _timeout){
   return waitNodesState(_nodes, _num_nodes, 
 			  NDB_MGM_NODE_STATUS_NOT_STARTED, _timeout);  
@@ -549,7 +549,7 @@
   
 }
 
-int NdbRestarter::startNodes(int * nodes, int num_nodes){
+int NdbRestarter::startNodes(const int * nodes, int num_nodes){
   if (!isConnected())
     return -1;
   
@@ -599,7 +599,7 @@
 
 
 
-int NdbRestarter::dumpStateOneNode(int _nodeId, int * _args, int _num_args){
+int NdbRestarter::dumpStateOneNode(int _nodeId, const int * _args, int _num_args){
  if (!isConnected())
     return -1;
 
@@ -617,7 +617,7 @@
   return reply.return_code;  
 }
 
-int NdbRestarter::dumpStateAllNodes(int * _args, int _num_args){
+int NdbRestarter::dumpStateAllNodes(const int * _args, int _num_args){
  if (!isConnected())
     return -1;