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
32b352b
..
6f2d69a
100644
(file)
--- a/
src/mysql.c
+++ b/
src/mysql.c
@@
-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);
}