Merge branch '2.2' into develop

2018-09-14 10:38:26 +03:00
parent 8c561c6e55 c600b8ab92
commit 4e41978069
8 changed files with 49 additions and 12 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] && strncmp(row[1], "xtrabackup", 10) == 0)
+            if (row[1] && (strcmp(row[1], "xtrabackup") == 0 || strcmp(row[1], "mariabackup")))
            {
                rval = true;
            }