Merge branch '2.2' into develop

2018-09-17 13:02:53 +03:00
parent eeb61216de 81a18db18e
commit 3b78996c4c
2 changed files with 9 additions and 4 deletions
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@ -352,7 +352,7 @@ static bool using_xtrabackup(MXS_MONITORED_SERVER* database, const char* server_

        while ((row = mysql_fetch_row(result)))
        {
-            if (row[1] && (strcmp(row[1], "xtrabackup") == 0 || strcmp(row[1], "mariabackup")))
+            if (row[1] && (strcmp(row[1], "xtrabackup") == 0 || strcmp(row[1], "mariabackup") == 0))
            {
                rval = true;
            }