Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

10 files changed, 23 insertions, 21 deletions

diff --git a/ndb/src/kernel/blocks/grep/Grep.hpp b/ndb/src/kernel/blocks/grep/Grep.hpp
index ba8f5780522..eeabac36966 100644
--- a/ndb/src/kernel/blocks/grep/Grep.hpp
+++ b/ndb/src/kernel/blocks/grep/Grep.hpp
@@ -148,7 +148,7 @@ private:
  */
 class Grep : public SimulatedBlock //GrepParticipant
 {
-  //BLOCK_DEFINES(Grep);
+  BLOCK_DEFINES(Grep);
 
 public:
   Grep(const Configuration & conf);
@@ -519,19 +519,6 @@ public:
   typedef void (Grep::* ExecSignalLocal1) (Signal* signal); 
   typedef void (Grep::PSCoord::* ExecSignalLocal2) (Signal* signal); 
   typedef void (Grep::PSPart::* ExecSignalLocal4) (Signal* signal); 
-
-  void 
-  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal1 f, bool force = false){
-    addRecSignalImpl(gsn, (ExecFunction)f, force);
-  }
-  void 
-  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal2 f, bool force = false){
-    addRecSignalImpl(gsn, (ExecFunction)f, force);
-  }
-  void 
-  addRecSignal(GlobalSignalNumber gsn, ExecSignalLocal4 f, bool force = false){
-    addRecSignalImpl(gsn, (ExecFunction)f, force);
-  }
 };
 
 
diff --git a/ndb/src/kernel/blocks/grep/GrepInit.cpp b/ndb/src/kernel/blocks/grep/GrepInit.cpp
index 70bf6678754..cfb454a1f9b 100644
--- a/ndb/src/kernel/blocks/grep/GrepInit.cpp
+++ b/ndb/src/kernel/blocks/grep/GrepInit.cpp
@@ -132,7 +132,7 @@ Grep::~Grep()
 {
 }
 
-//BLOCK_FUNCTIONS(Grep);
+BLOCK_FUNCTIONS(Grep);
 
 Grep::PSPart::PSPart(Grep * sb) :
   BlockComponent(sb),
diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/ndb/src/mgmclient/CommandInterpreter.cpp
index 7175952aed0..141a0be0eff 100644
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/ndb/src/mgmclient/CommandInterpreter.cpp
@@ -655,12 +655,20 @@ CommandInterpreter::executeShow(char* parameters)
       mgm_nodes= 0;
 
     for(i=0; i < state->no_of_nodes; i++) {
+      if(state->node_states[i].node_type == NDB_MGM_NODE_TYPE_NDB &&
+	 state->node_states[i].version != 0){
+	master_id= state->node_states[i].dynamic_id;
+	break;
+      }
+    }
+    
+    for(i=0; i < state->no_of_nodes; i++) {
       switch(state->node_states[i].node_type) {
       case NDB_MGM_NODE_TYPE_API:
 	api_nodes++;
 	break;
       case NDB_MGM_NODE_TYPE_NDB:
-	if (state->node_states[i].dynamic_id > master_id)
+	if (state->node_states[i].dynamic_id < master_id)
 	  master_id= state->node_states[i].dynamic_id;
 	ndb_nodes++;
 	break;
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 587d5a7572d..0936ec234cf 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -2304,7 +2304,7 @@ bool
 MgmtSrvr::alloc_node_id(NodeId * nodeId, 
 			enum ndb_mgm_node_type type,
 			struct sockaddr *client_addr, 
-			socklen_t *client_addr_len)
+			SOCKET_SIZE_TYPE *client_addr_len)
 {
   Guard g(&f_node_id_mutex);
 #if 0
@@ -2885,4 +2885,6 @@ MgmtSrvr::setDbParameter(int node, int param, const char * value,
 }
 
 template class Vector<SigMatch>;
+#if __SUNPRO_CC != 0x560
 template bool SignalQueue::waitFor<SigMatch>(Vector<SigMatch>&, SigMatch*&, NdbApiSignal*&, unsigned);
+#endif
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/ndb/src/mgmsrv/MgmtSrvr.hpp
index 661dcdfb784..b26eaeb4ab9 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.hpp
@@ -467,7 +467,7 @@ public:
    */
   bool getNextNodeId(NodeId * _nodeId, enum ndb_mgm_node_type type) const ;
   bool alloc_node_id(NodeId * _nodeId, enum ndb_mgm_node_type type,
-		     struct sockaddr *client_addr, socklen_t *client_addr_len);
+		     struct sockaddr *client_addr, SOCKET_SIZE_TYPE *client_addr_len);
   
   /**
    *
diff --git a/ndb/src/mgmsrv/Services.cpp b/ndb/src/mgmsrv/Services.cpp
index 2874fd9691a..7bf408583de 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/ndb/src/mgmsrv/Services.cpp
@@ -402,7 +402,7 @@ MgmApiSession::get_nodeid(Parser_t::Context &,
   }
 
   struct sockaddr addr;
-  socklen_t addrlen= sizeof(addr);
+  SOCKET_SIZE_TYPE addrlen= sizeof(addr);
   int r = getpeername(m_socket, &addr, &addrlen);
   if (r != 0 ) {
     m_output->println(cmd);
diff --git a/ndb/src/ndbapi/NdbEventOperation.cpp b/ndb/src/ndbapi/NdbEventOperation.cpp
index ebdebaffd61..506a6c8d86d 100644
--- a/ndb/src/ndbapi/NdbEventOperation.cpp
+++ b/ndb/src/ndbapi/NdbEventOperation.cpp
@@ -37,7 +37,7 @@
 
 NdbEventOperation::NdbEventOperation(Ndb *theNdb, 
 				     const char* eventName, 
-				     const int bufferLength) 
+				     int bufferLength) 
   : m_impl(* new NdbEventOperationImpl(*this,theNdb, 
 				       eventName, 
 				       bufferLength))
diff --git a/ndb/src/ndbapi/NdbScanFilter.cpp b/ndb/src/ndbapi/NdbScanFilter.cpp
index eace1a0acf5..3813ab139de 100644
--- a/ndb/src/ndbapi/NdbScanFilter.cpp
+++ b/ndb/src/ndbapi/NdbScanFilter.cpp
@@ -778,7 +778,8 @@ main(void){
 #endif
 
 template class Vector<NdbScanFilterImpl::State>;
+#if __SUNPRO_CC != 0x560
 template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint32);
 template int NdbScanFilterImpl::cond_col_const(Interpreter::BinaryCondition, Uint32 attrId, Uint64);
-
+#endif
 
diff --git a/ndb/src/ndbapi/TransporterFacade.hpp b/ndb/src/ndbapi/TransporterFacade.hpp
index 60ea3625524..14da4b11aa1 100644
--- a/ndb/src/ndbapi/TransporterFacade.hpp
+++ b/ndb/src/ndbapi/TransporterFacade.hpp
@@ -161,7 +161,9 @@ private:
   /**
    * Block number handling
    */
+public:
   static const unsigned MAX_NO_THREADS = 4711;
+private:
 
   struct ThreadData {
     static const Uint32 ACTIVE = (1 << 16) | 1;
diff --git a/ndb/test/ndbapi/testIndex.cpp b/ndb/test/ndbapi/testIndex.cpp
index a0844cee8f8..6ebbfd8b680 100644
--- a/ndb/test/ndbapi/testIndex.cpp
+++ b/ndb/test/ndbapi/testIndex.cpp
@@ -386,6 +386,7 @@ sync_down(NDBT_Context* ctx){
   if(threads){
     ctx->decProperty("PauseThreads");
   }
+  return 0;
 }
 
 int
@@ -397,6 +398,7 @@ sync_up_and_wait(NDBT_Context* ctx){
   if(threads){
     ndbout_c("wait completed");
   }
+  return 0;
 }
 
 int