Merge branch 'collectd-5.5'

diff --git a/src/mysql.c b/src/mysql.c
index db38a4b00cde26057aed301b3a22a67b1e144237..8a1692064b534dda25db368fdb77830cbebdcf15 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -65,9 +65,6 @@ typedef struct mysql_database_s mysql_database_t; /* }}} */
 
 static int mysql_read (user_data_t *ud);
 
-void mysql_read_default_options(struct st_mysql_options *options,
-               const char *filename, const char *group);
-
 static void mysql_database_free (void *arg) /* {{{ */
 {
        mysql_database_t *db;