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.6' into collectd-4.7
[collectd.git]
/
src
/
mysql.c
diff --git
a/src/mysql.c
b/src/mysql.c
index
ca364b6
..
f243c50
100644
(file)
--- a/
src/mysql.c
+++ b/
src/mysql.c
@@
-24,7
+24,7
@@
* 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>
- * Rodolphe QuiƩdeville
l
<rquiedeville at bearstech.com>
+ * Rodolphe QuiƩdeville <rquiedeville at bearstech.com>
**/
#include "collectd.h"
**/
#include "collectd.h"
@@
-747,23
+747,30
@@
static int mysql_read (user_data_t *ud)
key = row[0];
val = atoll (row[1]);
key = row[0];
val = atoll (row[1]);
- if (strncmp (key, "Com_", 4) == 0)
+ if (strncmp (key, "Com_",
+ strlen ("Com_")) == 0)
{
if (val == 0ULL)
continue;
/* Ignore `prepared statements' */
{
if (val == 0ULL)
continue;
/* Ignore `prepared statements' */
- if (strncmp (key, "Com_stmt_", 9) != 0)
- counter_submit ("mysql_commands", key + 4, val, db);
+ if (strncmp (key, "Com_stmt_", strlen ("Com_stmt_")) != 0)
+ counter_submit ("mysql_commands",
+ key + strlen ("Com_"),
+ val, db);
}
}
- else if (strncmp (key, "Handler_", 8) == 0)
+ else if (strncmp (key, "Handler_",
+ strlen ("Handler_")) == 0)
{
if (val == 0ULL)
continue;
{
if (val == 0ULL)
continue;
- counter_submit ("mysql_handler", key + 8, val, db);
+ counter_submit ("mysql_handler",
+ key + strlen ("Handler_"),
+ val, db);
}
}
- else if (strncmp (key, "Qcache_", 7) == 0)
+ else if (strncmp (key, "Qcache_",
+ strlen ("Qcache_")) == 0)
{
if (strcmp (key, "Qcache_hits") == 0)
qcache_hits = val;
{
if (strcmp (key, "Qcache_hits") == 0)
qcache_hits = val;
@@
-776,14
+783,16
@@
static int mysql_read (user_data_t *ud)
else if (strcmp (key, "Qcache_queries_in_cache") == 0)
qcache_queries_in_cache = (int) val;
}
else if (strcmp (key, "Qcache_queries_in_cache") == 0)
qcache_queries_in_cache = (int) val;
}
- else if (strncmp (key, "Bytes_", 6) == 0)
+ else if (strncmp (key, "Bytes_",
+ strlen ("Bytes_")) == 0)
{
if (strcmp (key, "Bytes_received") == 0)
traffic_incoming += val;
else if (strcmp (key, "Bytes_sent") == 0)
traffic_outgoing += val;
}
{
if (strcmp (key, "Bytes_received") == 0)
traffic_incoming += val;
else if (strcmp (key, "Bytes_sent") == 0)
traffic_outgoing += val;
}
- else if (strncmp (key, "Threads_", 8) == 0)
+ else if (strncmp (key, "Threads_",
+ strlen ("Threads_")) == 0)
{
if (strcmp (key, "Threads_running") == 0)
threads_running = (int) val;
{
if (strcmp (key, "Threads_running") == 0)
threads_running = (int) val;
@@
-794,12
+803,12
@@
static int mysql_read (user_data_t *ud)
else if (strcmp (key, "Threads_created") == 0)
threads_created = val;
}
else if (strcmp (key, "Threads_created") == 0)
threads_created = val;
}
- else if (strncmp (key, "Table_locks_", 12) == 0)
+ else if (strncmp (key, "Table_locks_",
+ strlen ("Table_locks_")) == 0)
{
{
- if (val == 0ULL)
- continue;
-
- counter_submit ("mysql_locks", key + 12, val, db);
+ counter_submit ("mysql_locks",
+ key + strlen ("Table_locks_"),
+ val, db);
}
}
mysql_free_result (res); res = NULL;
}
}
mysql_free_result (res); res = NULL;