2 files changed, 26 insertions, 13 deletions

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 062ec657..6134d6c6 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -282,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;
+                                        }
                                 }
                         }
 
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index a5a7afe8..f470d222 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -41,8 +41,6 @@ const char *email = "devel@monitoring-plugins.org";
 #include "../lib/output.h"
 #include "check_snmp.d/check_snmp_helpers.h"
 
-#include <bits/getopt_core.h>
-#include <bits/getopt_ext.h>
 #include <strings.h>
 #include <stdint.h>