contrib/migrate-3-4.px: Create (sub)directories for the disk plugin.

[collectd.git] / src / mysql.c

diff --git a/src/mysql.c b/src/mysql.c
index f622d3d653c440244719ba546b7512da5d641049..fccaedbdc891eb42a7aceaec38dc468370f54ba7 100644 (file)
--- a/src/mysql.c
+++ b/src/mysql.c
@@ -36,59 +36,6 @@
 
 /* TODO: Understand `Select_*' and possibly do that stuff as well.. */
 
-static data_source_t data_source_counter[1] =
-{
-       {"value", DS_TYPE_COUNTER, 0, NAN}
-};
-
-static data_set_t ds_commands =
-{
-       "mysql_commands", 1, data_source_counter
-};
-
-static data_set_t ds_handler =
-{
-       "mysql_handler", 1, data_source_counter
-};
-
-static data_source_t data_source_qcache[5] =
-{
-       {"hits",             DS_TYPE_COUNTER, 0, NAN},
-       {"inserts",          DS_TYPE_COUNTER, 0, NAN},
-       {"not_cached",       DS_TYPE_COUNTER, 0, NAN},
-       {"lowmem_prunes",    DS_TYPE_COUNTER, 0, NAN},
-       {"queries_in_cache", DS_TYPE_GAUGE,   0, NAN}
-};
-
-static data_set_t ds_qcache =
-{
-       "mysql_qcache", 5, data_source_qcache
-};
-
-static data_source_t data_source_threads[4] =
-{
-       {"running",   DS_TYPE_GAUGE,   0, NAN},
-       {"connected", DS_TYPE_GAUGE,   0, NAN},
-       {"cached",    DS_TYPE_GAUGE,   0, NAN},
-       {"created",   DS_TYPE_COUNTER, 0, NAN}
-};
-
-static data_set_t ds_threads =
-{
-       "mysql_threads", 4, data_source_threads
-};
-
-static data_source_t data_source_octets[2] =
-{
-       {"rx", DS_TYPE_COUNTER, 0, 4294967295.0},
-       {"tx", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t ds_octets =
-{
-       "mysql_octets", 2, data_source_octets
-};
-
 #if MYSQL_HAVE_READ
 static const char *config_keys[] =
 {
@@ -113,8 +60,6 @@ static MYSQL *getconnection (void)
        static int wait_for = 0;
        static int wait_increase = 60;
 
-       int step;
-
        if (state != 0)
        {
                int err;
@@ -130,11 +75,9 @@ static MYSQL *getconnection (void)
                }
        }
 
-       step = atoi (COLLECTD_STEP);
-
        if (wait_for > 0)
        {
-               wait_for -= step;
+               wait_for -= interval_g;
                return (NULL);
        }
 
@@ -383,12 +326,6 @@ static int mysql_read (void)
 
 void module_register (void)
 {
-       plugin_register_data_set (&ds_commands);
-       plugin_register_data_set (&ds_handler);
-       plugin_register_data_set (&ds_qcache);
-       plugin_register_data_set (&ds_threads);
-       plugin_register_data_set (&ds_octets);
-
 #if MYSQL_HAVE_READ
        plugin_register_config ("mysql", config, config_keys, config_keys_num);
        plugin_register_read ("mysql", mysql_read);