projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for the Solaris OS processes
[collectd.git]
/
src
/
mysql.c
diff --git
a/src/mysql.c
b/src/mysql.c
index
cae6760
..
32b352b
100644
(file)
--- a/
src/mysql.c
+++ b/
src/mysql.c
@@
-192,9
+192,9
@@
static int mysql_config_database (oconfig_item_t *ci) /* {{{ */
ud.data = (void *) db;
ud.free_func = mysql_database_free;
ud.data = (void *) db;
ud.free_func = mysql_database_free;
- if (db->
databas
e != NULL)
+ if (db->
instanc
e != NULL)
ssnprintf (cb_name, sizeof (cb_name), "mysql-%s",
ssnprintf (cb_name, sizeof (cb_name), "mysql-%s",
- db->
databas
e);
+ db->
instanc
e);
else
sstrncpy (cb_name, "mysql", sizeof (cb_name));
else
sstrncpy (cb_name, "mysql", sizeof (cb_name));
@@
-555,7
+555,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;
derive_t qcache_hits = 0;
derive_t qcache_inserts = 0;
derive_t qcache_hits = 0;
derive_t qcache_inserts = 0;
@@
-591,7
+590,6
@@
static int mysql_read (user_data_t *ud)
if (res == NULL)
return (-1);
if (res == NULL)
return (-1);
- field_num = mysql_num_fields (res);
while ((row = mysql_fetch_row (res)))
{
char *key;
while ((row = mysql_fetch_row (res)))
{
char *key;