1 files changed, 36 insertions, 31 deletions

diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 9d8094c0..26730d4c 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -96,6 +96,10 @@ int main(int argc, char **argv) {
 
         const check_mysql_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         MYSQL mysql;
         /* initialize mysql  */
         mysql_init(&mysql);
@@ -341,37 +345,23 @@ int main(int argc, char **argv) {
                         int replica_io_field = -1;
                         int replica_sql_field = -1;
                         int seconds_behind_field = -1;
-                        int num_fields;
-                        MYSQL_FIELD *fields;
-                        num_fields = mysql_num_fields(res);
-                        fields = mysql_fetch_fields(res);
-                        for (int i = 0; i < num_fields; i++) {
-                                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;
-                                        }
+                        unsigned int num_fields = mysql_num_fields(res);
+                        MYSQL_FIELD *fields = mysql_fetch_fields(res);
+                        for (int i = 0; i < (int)num_fields; i++) {
+                                if ((strcasecmp(fields[i].name, "Slave_IO_Running") == 0) ||
+                                        (strcasecmp(fields[i].name, "Replica_IO_Running") == 0)) {
+                                        replica_io_field = i;
+                                        continue;
+                                }
+                                if ((strcasecmp(fields[i].name, "Slave_SQL_Running") == 0) ||
+                                        (strcasecmp(fields[i].name, "Replica_SQL_Running") == 0)) {
+                                        replica_sql_field = i;
+                                        continue;
+                                }
+                                if ((strcasecmp(fields[i].name, "Seconds_Behind_Master") == 0) ||
+                                        (strcasecmp(fields[i].name, "Seconds_Behind_Source") == 0)) {
+                                        seconds_behind_field = i;
+                                        continue;
                                 }
                         }
 
@@ -471,6 +461,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
 
         enum {
                 CHECK_REPLICA_OPT = CHAR_MAX + 1,
+                output_format_index,
         };
 
         static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
@@ -495,6 +486,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"cert", required_argument, 0, 'a'},
                                                                            {"ca-dir", required_argument, 0, 'D'},
                                                                            {"ciphers", required_argument, 0, 'L'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_mysql_config_wrapper result = {
@@ -605,6 +597,17 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                         break;
                 case '?': /* help */
                         usage5();
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
@@ -711,6 +714,8 @@ void print_help(void) {
         printf(" %s\n", "-L, --ciphers=STRING");
         printf("    %s\n", _("List of valid SSL ciphers"));
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf(" %s\n",
                    _("There are no required arguments. By default, the local database is checked"));