1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
joreland@mysql.com 2004-08-24 17:24:04 +02:00
commit 7e37b9fe9f
10 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ndb/src/kernel/blocks/grep/Grep.hpp
View File

@ -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);
}
};

2
ndb/src/kernel/blocks/grep/GrepInit.cpp
View File

@ -132,7 +132,7 @@ Grep::~Grep()
{
}
//BLOCK_FUNCTIONS(Grep);
BLOCK_FUNCTIONS(Grep);
Grep::PSPart::PSPart(Grep * sb) :
BlockComponent(sb),

10
ndb/src/mgmclient/CommandInterpreter.cpp
View File

@ -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;

4
ndb/src/mgmsrv/MgmtSrvr.cpp
View File

@ -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

2
ndb/src/mgmsrv/MgmtSrvr.hpp
View File

@ -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);
/**
*

2
ndb/src/mgmsrv/Services.cpp
View File

@ -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);

2
ndb/src/ndbapi/NdbEventOperation.cpp
View File

@ -37,7 +37,7 @@
NdbEventOperation::NdbEventOperation(Ndb *theNdb,
const char* eventName,
const int bufferLength)
int bufferLength)
: m_impl(* new NdbEventOperationImpl(*this,theNdb,
eventName,
bufferLength))

3
ndb/src/ndbapi/NdbScanFilter.cpp
View File

@ -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

2
ndb/src/ndbapi/TransporterFacade.hpp
View File

@ -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;

2
ndb/test/ndbapi/testIndex.cpp
View File

@ -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