X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=4e72b5bf8989669cafb724ce011cc8b0a28cc2ee;hb=e628f39838a67b40d52dfb8425b4d8474fbd0550;hp=30557f61bd0e7e662bf37eac10194327a763327f;hpb=23164f56d04219d0dd1b1e4954c3edc0609f0eb8;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index 30557f61..4e72b5bf 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -130,9 +130,10 @@ static void counter_submit (const char *type, const char *type_instance,
 	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
-	strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
+	sstrncpy (vl.type, type, sizeof (vl.type));
+	sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
 
-	plugin_dispatch_values (type, &vl);
+	plugin_dispatch_values (&vl);
 } /* void counter_submit */
 
 static void qcache_submit (counter_t hits, counter_t inserts,
@@ -153,8 +154,9 @@ static void qcache_submit (counter_t hits, counter_t inserts,
 	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, "mysql_qcache", sizeof (vl.type));
 
-	plugin_dispatch_values ("mysql_qcache", &vl);
+	plugin_dispatch_values (&vl);
 } /* void qcache_submit */
 
 static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached,
@@ -173,8 +175,9 @@ static void threads_submit (gauge_t running, gauge_t connected, gauge_t cached,
 	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, "mysql_threads", sizeof (vl.type));
 
-	plugin_dispatch_values ("mysql_threads", &vl);
+	plugin_dispatch_values (&vl);
 } /* void threads_submit */
 
 static void traffic_submit (counter_t rx, counter_t tx)
@@ -190,8 +193,9 @@ static void traffic_submit (counter_t rx, counter_t tx)
 	vl.time = time (NULL);
 	sstrncpy (vl.host, hostname_g, sizeof (vl.host));
 	sstrncpy (vl.plugin, "mysql", sizeof (vl.plugin));
+	sstrncpy (vl.type, "mysql_octets", sizeof (vl.type));
 
-	plugin_dispatch_values ("mysql_octets", &vl);
+	plugin_dispatch_values (&vl);
 } /* void traffic_submit */
 
 static int mysql_read (void)