diff options
| author | unknown <joreland@mysql.com> | 2004-08-24 17:24:04 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-24 17:24:04 +0200 |
| commit | 63d253171d5d7e8790dc1fe668335aea28209f79 (patch) | |
| tree | d8d99271da571a73b21523c1584e16e10577466b /ndb/src/mgmsrv/MgmtSrvr.cpp | |
| parent | 7b2966f9730948b40c5a46765d953ca9817ab1e5 (diff) | |
| parent | 940a6b4e3e488813dfd39ff2b5d6dd7ecadd4817 (diff) | |
| download | mariadb-git-63d253171d5d7e8790dc1fe668335aea28209f79.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'ndb/src/mgmsrv/MgmtSrvr.cpp')
| -rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |