X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmysql.c;h=f4ad01c685c48e0e6b123c0f49563558bf228081;hb=aff80830f1154a5b6c4da16a0b1033aafde14e24;hp=a01bbe4018d3f63f973da07c3c5196f1f46e2597;hpb=58217009d8028d2e5d654c8b76562f59e28c9c30;p=collectd.git

diff --git a/src/mysql.c b/src/mysql.c
index a01bbe40..f4ad01c6 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -321,11 +321,11 @@ static void submit (const char *type, const char *type_instance,
 } /* submit */
 
 static void counter_submit (const char *type, const char *type_instance,
-		counter_t value, mysql_database_t *db)
+		derive_t value, mysql_database_t *db)
 {
 	value_t values[1];
 
-	values[0].counter = value;
+	values[0].derive = value;
 	submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db);
 } /* void counter_submit */
 
@@ -347,12 +347,12 @@ static void derive_submit (const char *type, const char *type_instance,
 	submit (type, type_instance, values, STATIC_ARRAY_SIZE (values), db);
 } /* void derive_submit */
 
-static void traffic_submit (counter_t rx, counter_t tx, mysql_database_t *db)
+static void traffic_submit (derive_t rx, derive_t tx, mysql_database_t *db)
 {
 	value_t values[2];
 
-	values[0].counter = rx;
-	values[1].counter = tx;
+	values[0].derive = rx;
+	values[1].derive = tx;
 
 	submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db);
 } /* void traffic_submit */
@@ -485,7 +485,7 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con)
 
 	if (db->slave_notif)
 	{
-		notification_t n = { 0, time (NULL), "", "",
+		notification_t n = { 0, cdtime (), "", "",
 			"mysql", "", "time_offset", "", NULL };
 
 		char *io, *sql;