summaryrefslogtreecommitdiffstats
path: root/ommysql.c
diff options
context:
space:
mode:
authorMichael Meckelein <mmeckelein@hq.adiscon.com>2007-08-22 10:49:32 +0000
committerMichael Meckelein <mmeckelein@hq.adiscon.com>2007-08-22 10:49:32 +0000
commitfb13c3a39850ba28bf28ae8aead9c80c180fc13f (patch)
tree53ac7c98ac9be1a540e70d7c584642aa0607b2fd /ommysql.c
parentd1a76e1bdfd1c61d0244a3860cf05211f2458ca2 (diff)
downloadrsyslog-fb13c3a39850ba28bf28ae8aead9c80c180fc13f.tar.gz
rsyslog-fb13c3a39850ba28bf28ae8aead9c80c180fc13f.tar.xz
rsyslog-fb13c3a39850ba28bf28ae8aead9c80c180fc13f.zip
applied patches which will be released under 1.19.1, changed doc for 1.19.1v1-19-1
release
Diffstat (limited to 'ommysql.c')
-rw-r--r--ommysql.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ommysql.c b/ommysql.c
index 19e980a0..07288833 100644
--- a/ommysql.c
+++ b/ommysql.c
@@ -79,6 +79,7 @@ static void closeMySQL(instanceData *pData)
assert(pData != NULL);
if(pData->f_hmysql != NULL) { /* just to be on the safe side... */
+ mysql_server_end();
mysql_close(pData->f_hmysql);
pData->f_hmysql = NULL;
}
@@ -229,7 +230,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1)
/* ok, if we reach this point, we have something for us */
if((iRet = createInstance(&pData)) != RS_RET_OK)
- return iRet;
+ goto finalize_it;
p++; /* eat '>' '*/