From: Florian Forster <octo@collectd.org>
Date: Thu, 30 May 2013 06:10:42 +0000 (+0200)
Subject: Merge branch 'collectd-4.10' into collectd-5.2
X-Git-Tag: collectd-5.3.1~4^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a05485da75ec42a9aa38354e0d0364885b1ecad9;hp=03d8ea084519d9d845e9ca8922f0177aeb9faa2d;p=collectd.git

Merge branch 'collectd-4.10' into collectd-5.2
---

diff --git a/src/mysql.c b/src/mysql.c
index d2d0b4bf..d15a055f 100644
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -534,7 +534,7 @@ static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con)
 			ssnprintf (n.message, sizeof (n.message),
 					"slave SQL thread started");
 			plugin_dispatch_notification (&n);
-			db->slave_sql_running = 0;
+			db->slave_sql_running = 1;
 		}
 	}
 
diff --git a/src/utils_mount.h b/src/utils_mount.h
index 1f2403c3..83f789be 100644
--- a/src/utils_mount.h
+++ b/src/utils_mount.h
@@ -26,6 +26,7 @@
 #ifndef COLLECTD_UTILS_MOUNT_H
 #define COLLECTD_UTILS_MOUNT_H 1
 
+#include <stdio.h>
 #if HAVE_FS_INFO_H
 # include <fs_info.h>
 #endif