Monitor types and fields cleanup

Moves some enums to class enums. Moves some free functions to class methods.
2019-05-14 17:57:22 +03:00
parent f86f2c7688
commit 08b4c26652
5 changed files with 76 additions and 94 deletions
--- a/server/modules/monitor/clustrixmon/clustrix.cc
+++ b/server/modules/monitor/clustrixmon/clustrix.cc
@ -208,7 +208,7 @@ bool Clustrix::ping_or_connect_to_hub(const char* zName,
                                      MYSQL** ppCon)
 {
    bool connected = false;
-    mxs_connect_result_t rv = Monitor::ping_or_connect_to_db(settings, server, ppCon);
+    MonitorServer::ConnectResult rv = Monitor::ping_or_connect_to_db(settings, server, ppCon);

    if (Monitor::connection_is_ok(rv))
    {