diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index d82dea142b7cfed8cc31f1d36f9d2df10a587977..05d2b019c276c627f6e4ed8bc5277cb1936db693 100644 (file)
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
* License: GPL
* Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2007 Nagios Plugins Development Team
+* Copyright (c) 1999-2009 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains the check_mysql plugin
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
const char *progname = "check_mysql";
-const char *revision = "$Revision$";
const char *copyright = "1999-2007";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
MYSQL mysql;
MYSQL_RES *res;
MYSQL_ROW row;
-
+
/* should be status */
-
+
char *result = NULL;
char *error = NULL;
char slaveresult[SLAVERESULTSIZE];
continue;
}
}
+
if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) {
mysql_free_result (res);
mysql_close (&mysql);
die (STATE_CRITICAL, "Slave status unavailable\n");
}
-
- 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]);
+
+ 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");
if (strcmp (row[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
mysql_free_result (res);
mysql_close (&mysql);
critical = optarg;
break;
case 'V': /* version */
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
exit (STATE_OK);
case 'h': /* help */
print_help ();
if (db_host == NULL)
db_host = strdup("");
- if (db_pass == NULL)
- db_pass = strdup("");
-
if (db == NULL)
db = strdup("");
char *myport;
asprintf (&myport, "%d", MYSQL_PORT);
- print_revision (progname, revision);
+ print_revision (progname, NP_VERSION);
printf (_(COPYRIGHT), copyright, email);
- printf ("%s\n", _("This program tests connections to a mysql server"));
+ printf ("%s\n", _("This program tests connections to a MySQL server"));
printf ("\n\n");
printf ("\n");
printf ("%s\n", _("Notes:"));
printf (_(UT_EXTRA_OPTS_NOTES));
+ printf ("\n");
+ printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+ printf (" %s\n", _("overriding any my.cnf settings."));
#endif
printf (_(UT_SUPPORT));