1 files changed, 28 insertions, 16 deletions

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 3d7ec4cd..6134d6c6 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -219,16 +219,13 @@ int main(int argc, char **argv) {
                                         use_deprecated_slave_status = true;
                                 }
                         }
-                } else if (strstr(server_version, "MySQL") != NULL) {
-                        // Looks like MySQL
+                } else {
+                        // Looks like MySQL or at least not like MariaDB
                         if (major_version < 8) {
                                 use_deprecated_slave_status = true;
                         } else if (major_version == 10 && minor_version < 4) {
                                 use_deprecated_slave_status = true;
                         }
-                } else {
-                        printf("Not a known sever implementation: %s\n", server_version);
-                        exit(STATE_UNKNOWN);
                 }
 
                 char *replica_query = NULL;
@@ -285,17 +282,32 @@ int main(int argc, char **argv) {
                         num_fields = mysql_num_fields(res);
                         fields = mysql_fetch_fields(res);
                         for (int i = 0; i < num_fields; i++) {
-                                if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
-                                        replica_io_field = i;
-                                        continue;
-                                }
-                                if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) {
-                                        replica_sql_field = i;
-                                        continue;
-                                }
-                                if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) {
-                                        seconds_behind_field = i;
-                                        continue;
+                                if (use_deprecated_slave_status) {
+                                        if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
+                                                replica_io_field = i;
+                                                continue;
+                                        }
+                                        if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) {
+                                                replica_sql_field = i;
+                                                continue;
+                                        }
+                                        if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) {
+                                                seconds_behind_field = i;
+                                                continue;
+                                        }
+                                } else {
+                                        if (strcmp(fields[i].name, "Replica_IO_Running") == 0) {
+                                                replica_io_field = i;
+                                                continue;
+                                        }
+                                        if (strcmp(fields[i].name, "Replica_SQL_Running") == 0) {
+                                                replica_sql_field = i;
+                                                continue;
+                                        }
+                                        if (strcmp(fields[i].name, "Seconds_Behind_Source") == 0) {
+                                                seconds_behind_field = i;
+                                                continue;
+                                        }
                                 }
                         }