projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.1
[collectd.git]
/
src
/
mysql.c
diff --git
a/src/mysql.c
b/src/mysql.c
index
1ca3b48
..
6f2d69a
100644
(file)
--- a/
src/mysql.c
+++ b/
src/mysql.c
@@
-1,6
+1,6
@@
/**
* collectd - src/mysql.c
/**
* collectd - src/mysql.c
- * Copyright (C) 2006-20
09
Florian octo Forster
+ * Copyright (C) 2006-20
10
Florian octo Forster
* Copyright (C) 2008 Mirko Buffoni
* Copyright (C) 2009 Doug MacEachern
* Copyright (C) 2009 Sebastian tokkee Harl
* Copyright (C) 2008 Mirko Buffoni
* Copyright (C) 2009 Doug MacEachern
* Copyright (C) 2009 Sebastian tokkee Harl
@@
-20,7
+20,7
@@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Florian octo Forster <octo at
verplant
.org>
+ * Florian octo Forster <octo at
collectd
.org>
* Mirko Buffoni <briareos at eswat.org>
* Doug MacEachern <dougm at hyperic.com>
* Sebastian tokkee Harl <sh at tokkee.org>
* Mirko Buffoni <briareos at eswat.org>
* Doug MacEachern <dougm at hyperic.com>
* Sebastian tokkee Harl <sh at tokkee.org>
@@
-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));
@@
-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,
} /* 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];
{
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 */
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 */
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];
{
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 */
submit ("mysql_octets", NULL, values, STATIC_ARRAY_SIZE (values), db);
} /* void traffic_submit */
@@
-403,6
+403,7
@@
static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con)
{
ERROR ("mysql plugin: Failed to get master statistics: "
"`%s' did not return any rows.", query);
{
ERROR ("mysql plugin: Failed to get master statistics: "
"`%s' did not return any rows.", query);
+ mysql_free_result (res);
return (-1);
}
return (-1);
}
@@
-411,6
+412,7
@@
static int mysql_read_master_stats (mysql_database_t *db, MYSQL *con)
{
ERROR ("mysql plugin: Failed to get master statistics: "
"`%s' returned less than two columns.", query);
{
ERROR ("mysql plugin: Failed to get master statistics: "
"`%s' returned less than two columns.", query);
+ mysql_free_result (res);
return (-1);
}
return (-1);
}
@@
-454,6
+456,7
@@
static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con)
{
ERROR ("mysql plugin: Failed to get slave statistics: "
"`%s' did not return any rows.", query);
{
ERROR ("mysql plugin: Failed to get slave statistics: "
"`%s' did not return any rows.", query);
+ mysql_free_result (res);
return (-1);
}
return (-1);
}
@@
-462,6
+465,7
@@
static int mysql_read_slave_stats (mysql_database_t *db, MYSQL *con)
{
ERROR ("mysql plugin: Failed to get slave statistics: "
"`%s' returned less than 33 columns.", query);
{
ERROR ("mysql plugin: Failed to get slave statistics: "
"`%s' returned less than 33 columns.", query);
+ mysql_free_result (res);
return (-1);
}
return (-1);
}
@@
-555,7
+559,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
+594,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;