diff options
author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
---|---|---|
committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
commit | a04157fbb3f2b2e054c02968ffc82bb0eb971d58 (patch) | |
tree | db1cb9732cc2b568c4a56c3f6d11cf8f4d5250b6 /ndb/src/mgmsrv/MgmtSrvr.cpp | |
parent | 205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff) | |
parent | 9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (diff) | |
download | mariadb-git-a04157fbb3f2b2e054c02968ffc82bb0eb971d58.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'ndb/src/mgmsrv/MgmtSrvr.cpp')
-rw-r--r-- | ndb/src/mgmsrv/MgmtSrvr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp index ebef5510b55..d4a0e4bd142 100644 --- a/ndb/src/mgmsrv/MgmtSrvr.cpp +++ b/ndb/src/mgmsrv/MgmtSrvr.cpp @@ -100,6 +100,8 @@ MgmtSrvr::logLevelThread_C(void* m) extern EventLogger g_eventLogger; +#ifdef NOT_USED + static NdbOut& operator<<(NdbOut& out, const LogLevel & ll) { @@ -109,6 +111,7 @@ operator<<(NdbOut& out, const LogLevel & ll) out << "]"; return out; } +#endif void MgmtSrvr::logLevelThreadRun() @@ -1114,7 +1117,6 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, break; } case GSN_STOP_CONF:{ - const StopConf * const ref = CAST_CONSTPTR(StopConf, signal->getDataPtr()); const NodeId nodeId = refToNode(signal->header.theSendersBlockRef); #ifdef VM_TRACE ndbout_c("Node %d single user mode", nodeId); @@ -1144,8 +1146,6 @@ int MgmtSrvr::sendSTOP_REQ(const Vector<NodeId> &node_ids, break; } case GSN_NODE_FAILREP:{ - const NodeFailRep * const rep = - CAST_CONSTPTR(NodeFailRep, signal->getDataPtr()); break; } default: @@ -1333,7 +1333,7 @@ int MgmtSrvr::restartNodes(const Vector<NodeId> &node_ids, for (unsigned i = 0; i < node_ids.size(); i++) { - int result = start(node_ids[i]); + start(node_ids[i]); } return 0; } |