summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-10-31 17:53:25 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2013-10-31 17:53:25 +0100
commitd5d5e7397320bc77bf16190bc55eb7e047941ae1 (patch)
treea9825738078ec7942c11b625a95a496c3d2e0e73
parent5bee185791b02b88cd458b3d55c260ab5d503b05 (diff)
parent78a67ffbbab4aea3cc9642f445d0a9bed7e48fa7 (diff)
downloadrsyslog-d5d5e7397320bc77bf16190bc55eb7e047941ae1.tar.gz
rsyslog-d5d5e7397320bc77bf16190bc55eb7e047941ae1.tar.bz2
rsyslog-d5d5e7397320bc77bf16190bc55eb7e047941ae1.zip
Merge branch 'master' into master-ruleeng
-rw-r--r--ChangeLog5
-rw-r--r--plugins/ommysql/ommysql.c8
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b40634a..307cb385 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------
+Version 7.5.7 [devel] 2013-11-??
+- bugfix: ommysql lost configfile/section parameters after first close
+ This means that when a connection was broken, it was probably
+ re-instantiated with different parameters than configured.
+---------------------------------------------------------------------------
Version 7.5.6 [devel] 2013-10-29
- improved performance of RainerScript variable access
by refactoring the whole body of variable handling code. This also
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 2dfa29de..fb4f1e27 100644
--- a/plugins/ommysql/ommysql.c
+++ b/plugins/ommysql/ommysql.c
@@ -123,14 +123,6 @@ static void closeMySQL(instanceData *pData)
mysql_close(pData->f_hmysql);
pData->f_hmysql = NULL;
}
- if(pData->f_configfile!=NULL){
- free(pData->f_configfile);
- pData->f_configfile=NULL;
- }
- if(pData->f_configsection!=NULL){
- free(pData->f_configsection);
- pData->f_configsection=NULL;
- }
}
BEGINfreeInstance