Merge branch '2.2' into develop

2018-08-15 18:08:52 +03:00
parent be4f9125f0 435963f2ed
commit 0da0306ace
6 changed files with 30 additions and 52 deletions
--- a/server/modules/monitor/auroramon/auroramon.cc
+++ b/server/modules/monitor/auroramon/auroramon.cc
@ -73,7 +73,7 @@ void AuroraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
        int status = SERVER_SLAVE;

        /** The master will return a row with two identical non-NULL fields */
-        if (row[0] && row[1] && strcmp(row[0], row[1]) == 0)
+        if (row && row[0] && row[1] && strcmp(row[0], row[1]) == 0)
        {
            status = SERVER_MASTER;
        }