Commit fb8c55d7 authored by unknown's avatar unknown

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/test/include/NdbRestarter.hpp:
  Auto merged
parents 1fa79d3d 36fede40
...@@ -67,6 +67,8 @@ public: ...@@ -67,6 +67,8 @@ public:
int getRandomNodeOtherNodeGroup(int nodeId, int randomNumber); int getRandomNodeOtherNodeGroup(int nodeId, int randomNumber);
int getRandomNotMasterNodeId(int randomNumber); int getRandomNotMasterNodeId(int randomNumber);
NdbMgmHandle handle;
protected: protected:
int waitClusterState(ndb_mgm_node_status _status, int waitClusterState(ndb_mgm_node_status _status,
...@@ -89,7 +91,6 @@ protected: ...@@ -89,7 +91,6 @@ protected:
bool connected; bool connected;
BaseString addr; BaseString addr;
NdbMgmHandle handle;
ndb_mgm_configuration * m_config; ndb_mgm_configuration * m_config;
protected: protected:
ndb_mgm_configuration * getConfig(); ndb_mgm_configuration * getConfig();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment