diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-11 12:18:44 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-12-11 12:18:44 +0100 |
| commit | a647d5a51d003ebaa998024040539a363604c2d9 (patch) | |
| tree | ab0de5fd9b1c90b459459f6f674a328815636fba | |
| parent | 68bacb9a9395d4fffb063362940f74f4a3e45f28 (diff) | |
| parent | c9125981998541b63eaa55c7cdedb46fe2ae2701 (diff) | |
| download | rsyslog-a647d5a51d003ebaa998024040539a363604c2d9.tar.gz rsyslog-a647d5a51d003ebaa998024040539a363604c2d9.tar.xz rsyslog-a647d5a51d003ebaa998024040539a363604c2d9.zip | |
Merge branch 'beta'
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | plugins/ompgsql/ompgsql.c | 4 |
2 files changed, 10 insertions, 1 deletions
@@ -47,6 +47,13 @@ Version 5.3.6 [BETA] (rgerhards), 2009-11-?? Thanks to Jonathan Bond-Caron for the patch. - bugfix: $CreateDirs variable not properly initialized, default thus was random (but most often "on") [imported from v3] +- bugfix: ompgsql had problems with transaction support, what actually + rendered it unsuable. Thanks to forum user "horhe" for alerting me + on this bug and helping to debug/fix it! +- worked around an issue where omfile failed to compile on 32 bit platforms + under some circumstances (this smells like a gcc problem, but a simple + solution was available). Thanks to Kenneth Marshall for some advice. + [backported from 5.5.x branch] --------------------------------------------------------------------------- Version 5.3.5 [BETA] (rgerhards), 2009-11-13 - some light performance enhancement by replacing time() call with much diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c index cb6b6a4d..5a6ad733 100644 --- a/plugins/ompgsql/ompgsql.c +++ b/plugins/ompgsql/ompgsql.c @@ -245,7 +245,9 @@ ENDbeginTransaction BEGINdoAction CODESTARTdoAction dbgprintf("\n"); - iRet = writePgSQL(ppString[0], pData); + CHKiRet(writePgSQL(ppString[0], pData)); + iRet = RS_RET_DEFER_COMMIT; +finalize_it: ENDdoAction |