projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Many build fixes that turned up with GCC 4.6.
[collectd.git]
/
src
/
mysql.c
diff --git
a/src/mysql.c
b/src/mysql.c
index
30f5504
..
bfdbb76
100644
(file)
--- a/
src/mysql.c
+++ b/
src/mysql.c
@@
-342,7
+342,8
@@
static int mysql_config (oconfig_item_t *ci) /* {{{ */
else
sstrncpy (cb_name, "mysql", sizeof (cb_name));
else
sstrncpy (cb_name, "mysql", sizeof (cb_name));
- plugin_register_complex_read (cb_name, mysql_read,
+ plugin_register_complex_read (/* group = */ NULL, cb_name,
+ mysql_read,
/* interval = */ NULL, &ud);
}
else
/* interval = */ NULL, &ud);
}
else
@@
-706,7
+707,6
@@
static int mysql_read (user_data_t *ud)
MYSQL_RES *res;
MYSQL_ROW row;
char *query;
MYSQL_RES *res;
MYSQL_ROW row;
char *query;
- int field_num;
unsigned long long qcache_hits = 0ULL;
unsigned long long qcache_inserts = 0ULL;
unsigned long long qcache_hits = 0ULL;
unsigned long long qcache_inserts = 0ULL;
@@
-742,7
+742,7
@@
static int mysql_read (user_data_t *ud)
if (res == NULL)
return (-1);
if (res == NULL)
return (-1);
-
field_num =
mysql_num_fields (res);
+ mysql_num_fields (res);
while ((row = mysql_fetch_row (res)))
{
char *key;
while ((row = mysql_fetch_row (res)))
{
char *key;