X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fmysql.c;h=bfdbb76667aebc80d4a11f8a0714294b09cbdc94;hp=f243c5001f912d38c34db31caa4f60130a85e4ed;hb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;hpb=139dd00301131050db32bf0cb08333aa7440c817

diff --git a/src/mysql.c b/src/mysql.c
index f243c500..bfdbb766 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -342,7 +342,8 @@ static int mysql_config (oconfig_item_t *ci) /* {{{ */
 		else
 			sstrncpy (cb_name, "mysql", sizeof (cb_name));
 
-		plugin_register_complex_read (cb_name, mysql_read,
+		plugin_register_complex_read (/* group = */ NULL, cb_name,
+					      mysql_read,
 					      /* interval = */ NULL, &ud);
 	}
 	else
@@ -363,7 +364,11 @@ static MYSQL *getconnection (mysql_database_t *db)
 		int err;
 		if ((err = mysql_ping (db->con)) != 0)
 		{
-			WARNING ("mysql_ping failed: %s", mysql_error (db->con));
+			WARNING ("mysql_ping failed for %s: %s",
+					(db->instance != NULL)
+					? db->instance
+					: "<legacy>",
+					mysql_error (db->con));
 			db->state = 0;
 		}
 		else
@@ -393,7 +398,7 @@ static MYSQL *getconnection (mysql_database_t *db)
 	}
 	else
 	{
-		INFO ("mysql plugin: Sucessfully connected to database %s "
+		INFO ("mysql plugin: Successfully connected to database %s "
 				"at server %s (server version: %s, protocol version: %d)",
 				(db->database != NULL) ? db->database : "<none>",
 				mysql_get_host_info (db->con),
@@ -702,7 +707,6 @@ static int mysql_read (user_data_t *ud)
 	MYSQL_RES *res;
 	MYSQL_ROW  row;
 	char      *query;
-	int        field_num;
 
 	unsigned long long qcache_hits          = 0ULL;
 	unsigned long long qcache_inserts       = 0ULL;
@@ -738,7 +742,7 @@ static int mysql_read (user_data_t *ud)
 	if (res == NULL)
 		return (-1);
 
-	field_num = mysql_num_fields (res);
+	mysql_num_fields (res);
 	while ((row = mysql_fetch_row (res)))
 	{
 		char *key;