Merge branch '2.2' into 2.3

2018-11-01 10:52:03 +02:00
parent 9465ac6216 0b23ee78e5
commit cab40c54e4
3 changed files with 5 additions and 41 deletions
--- a/server/modules/monitor/galeramon/galeramon.cc
+++ b/server/modules/monitor/galeramon/galeramon.cc
@ -355,6 +355,10 @@ static bool using_xtrabackup(MXS_MONITORED_SERVER* database, const char* server_
            {
                rval = true;
            }
+            else if (row[1] && (strcmp(row[1], "xtrabackup-v2") == 0))
+            {
+                rval = true;
+            }
        }
        mysql_free_result(result);
    }