hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2276 Fix things due to MXS_MONITOR -> Monitor change

Browse Source
This commit is contained in:
Johan Wikman
2019-01-23 16:08:58 +02:00
parent 42b3402a71
commit 92b27500c7
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/monitor/clustrixmon/clustrix.hh
View File

@ -77,7 +77,7 @@ inline bool is_part_of_the_quorum(MXS_MONITORED_SERVER& ms)
*
* @note Upon return @c *ppCon will be non-NULL.
*/
bool ping_or_connect_to_hub(const MXS_MONITOR& mon, SERVER& server, MYSQL** ppCon);
bool ping_or_connect_to_hub(const Monitor& mon, SERVER& server, MYSQL** ppCon);
/**
* Ping or create connection to server and check whether it can be used
@ -88,7 +88,7 @@ bool ping_or_connect_to_hub(const MXS_MONITOR& mon, SERVER& server, MYSQL** ppCo
*
* @return True, if the server can be used as hub, false otherwise.
*/
inline bool ping_or_connect_to_hub(const MXS_MONITOR& mon, MXS_MONITORED_SERVER& ms)
inline bool ping_or_connect_to_hub(const Monitor& mon, MXS_MONITORED_SERVER& ms)
{
return ping_or_connect_to_hub(mon, *ms.server, &ms.con);
}