Commit 63d25317 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1
parents 7b2966f9 940a6b4e

ndb/src/kernel/blocks/grep/Grep.hpp

+1 −14
Original line number Diff line number Diff line
@@ -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);

  }

};

ndb/src/kernel/blocks/grep/GrepInit.cpp

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ Grep::~Grep() 
{

}



//BLOCK_FUNCTIONS(Grep);

BLOCK_FUNCTIONS(Grep);



Grep::PSPart::PSPart(Grep * sb) :

  BlockComponent(sb),

ndb/src/mgmclient/CommandInterpreter.cpp

+9 −1
Original line number Diff line number Diff line
@@ -654,13 +654,21 @@ CommandInterpreter::executeShow(char* parameters) 
      api_nodes= 0,

      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;

ndb/src/mgmsrv/MgmtSrvr.cpp

+3 −1
Original line number Diff line number Diff line
@@ -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

ndb/src/mgmsrv/MgmtSrvr.hpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

  

  /**

   *