diff options
| author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-03-24 02:01:48 -0400 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2009-03-24 02:01:48 -0400 |
| commit | ab3ada9aacd82356a6e5205f3ae26bbff55524db (patch) | |
| tree | c80b7aee657b34d8f018c94cac45ece1507f4c26 /plugins | |
| parent | f2f2f35240c976ddc6e44cd6276df88aad812199 (diff) | |
| download | monitoring-plugins-ab3ada9aacd82356a6e5205f3ae26bbff55524db.tar.gz | |
check_mysql: Fix segfault with old slaves (#2696823 - Oskar Ahner)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/check_mysql.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index 119ce0af..689648eb 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c | |||
| @@ -177,13 +177,14 @@ main (int argc, char **argv) | |||
| 177 | continue; | 177 | continue; |
| 178 | } | 178 | } |
| 179 | } | 179 | } |
| 180 | |||
| 180 | if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) { | 181 | if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) { |
| 181 | mysql_free_result (res); | 182 | mysql_free_result (res); |
| 182 | mysql_close (&mysql); | 183 | mysql_close (&mysql); |
| 183 | die (STATE_CRITICAL, "Slave status unavailable\n"); | 184 | die (STATE_CRITICAL, "Slave status unavailable\n"); |
| 184 | } | 185 | } |
| 185 | 186 | ||
| 186 | snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], row[seconds_behind_field]); | 187 | snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown"); |
| 187 | if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) { | 188 | if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) { |
| 188 | mysql_free_result (res); | 189 | mysql_free_result (res); |
| 189 | mysql_close (&mysql); | 190 | mysql_close (&mysql); |