X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foracle.c;h=1b17d9c39e18d41bfa3fe30dbe37a68fcd908612;hb=338db8de5f2cc289641f5f947f0fa1ef4070c3f2;hp=bf6aef58a4a5d50643c9dfa1371776421afe1085;hpb=358bf39b09f69220fc8e1b6c2fe98e5e185e3364;p=collectd.git diff --git a/src/oracle.c b/src/oracle.c index bf6aef58..1b17d9c3 100644 --- a/src/oracle.c +++ b/src/oracle.c @@ -75,10 +75,10 @@ typedef struct o_database_s o_database_t; /* * Global variables */ -static udb_query_t **queries = NULL; -static size_t queries_num = 0; -static o_database_t **databases = NULL; -static size_t databases_num = 0; +static udb_query_t **queries; +static size_t queries_num; +static o_database_t **databases; +static size_t databases_num; OCIEnv *oci_env = NULL; OCIError *oci_error = NULL; @@ -550,8 +550,7 @@ static int o_read_database_query(o_database_t *db, /* {{{ */ status = udb_query_prepare_result( q, prep_area, (db->host != NULL) ? db->host : hostname_g, /* plugin = */ (db->plugin_name != NULL) ? db->plugin_name : "oracle", - db->name, column_names, column_num, - /* interval = */ 0); + db->name, column_names, column_num); if (status != 0) { ERROR("oracle plugin: o_read_database_query (%s, %s): " "udb_query_prepare_result failed.", @@ -583,6 +582,8 @@ static int o_read_database_query(o_database_t *db, /* {{{ */ } } /* }}} while (42) */ + udb_query_finish_result(q, prep_area); + /* DEBUG ("oracle plugin: o_read_database_query: This statement succeeded: * %s", q->statement); */ FREE_ALL;