X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=30f5504a028d3a5bda49ceea927e82ee46c1dc84;hb=a294a8d4bc4779fc893575d62b7e50f969a94772;hp=b700ff02edc1596e41f5015d93397b284c2c2d70;hpb=72be377eaaeda26f4268aba543a2677db3940666;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index b700ff02..30f5504a 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -24,7 +24,7 @@
  *   Mirko Buffoni <briareos at eswat.org>
  *   Doug MacEachern <dougm at hyperic.com>
  *   Sebastian tokkee Harl <sh at tokkee.org>
- *   Rodolphe Quiédevillel <rquiedeville at bearstech.com>
+ *   Rodolphe Quiédeville <rquiedeville at bearstech.com>
  **/
 
 #include "collectd.h"
@@ -363,7 +363,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 +397,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),
@@ -747,23 +751,30 @@ static int mysql_read (user_data_t *ud)
 		key = row[0];
 		val = atoll (row[1]);
 
-		if (strncmp (key, "Com_", 4) == 0)
+		if (strncmp (key, "Com_", 
+			          strlen ("Com_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
 			/* Ignore `prepared statements' */
-			if (strncmp (key, "Com_stmt_", 9) != 0)
-				counter_submit ("mysql_commands", key + 4, val, db);
+			if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0)
+				counter_submit ("mysql_commands", 
+						key + strlen ("Com_"), 
+						val, db);
 		}
-		else if (strncmp (key, "Handler_", 8) == 0)
+		else if (strncmp (key, "Handler_", 
+				        strlen ("Handler_")) == 0)
 		{
 			if (val == 0ULL)
 				continue;
 
-			counter_submit ("mysql_handler", key + 8, val, db);
+			counter_submit ("mysql_handler", 
+					key + strlen ("Handler_"), 
+					val, db);
 		}
-		else if (strncmp (key, "Qcache_", 7) == 0)
+		else if (strncmp (key, "Qcache_",
+       				        strlen ("Qcache_")) == 0)
 		{
 			if (strcmp (key, "Qcache_hits") == 0)
 				qcache_hits = val;
@@ -776,14 +787,16 @@ static int mysql_read (user_data_t *ud)
 			else if (strcmp (key, "Qcache_queries_in_cache") == 0)
 				qcache_queries_in_cache = (int) val;
 		}
-		else if (strncmp (key, "Bytes_", 6) == 0)
+		else if (strncmp (key, "Bytes_", 
+				        strlen ("Bytes_")) == 0)
 		{
 			if (strcmp (key, "Bytes_received") == 0)
 				traffic_incoming += val;
 			else if (strcmp (key, "Bytes_sent") == 0)
 				traffic_outgoing += val;
 		}
-		else if (strncmp (key, "Threads_", 8) == 0)
+		else if (strncmp (key, "Threads_", 
+       				        strlen ("Threads_")) == 0)
 		{
 			if (strcmp (key, "Threads_running") == 0)
 				threads_running = (int) val;