diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 16:35:12 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-10 16:35:12 +0100 |
| commit | c8ebe623376bc025bf166ec333ac874c215de816 (patch) | |
| tree | 2e1c6f6a149bce3844ed21da08e5f0695de3fecc /plugins | |
| parent | 497bfeb287a75d1fb0f37502d3805307311a574d (diff) | |
| parent | 76b3f2cd875dca755f4beee8dbf525c23d9730cf (diff) | |
| download | rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.gz rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.xz rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
template.c
tests/Makefile.am
tests/parsertest.sh
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imuxsock/imuxsock.c | 2 | ||||
| -rw-r--r-- | plugins/ompgsql/createDB.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c index cf6df56c..17c85afb 100644 --- a/plugins/imuxsock/imuxsock.c +++ b/plugins/imuxsock/imuxsock.c @@ -362,7 +362,7 @@ CODESTARTwillRun /* we need to create the inputName property (only once during our lifetime) */ CHKiRet(prop.Construct(&pInputName)); - CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("imudp"), sizeof("imudp") - 1)); + CHKiRet(prop.SetString(pInputName, UCHAR_CONSTANT("imuxsock"), sizeof("imuxsock") - 1)); CHKiRet(prop.ConstructFinalize(pInputName)); finalize_it: diff --git a/plugins/ompgsql/createDB.sql b/plugins/ompgsql/createDB.sql index facdcaa0..2f72a0a6 100644 --- a/plugins/ompgsql/createDB.sql +++ b/plugins/ompgsql/createDB.sql @@ -1,4 +1,4 @@ -CREATE DATABASE "Syslog"; +CREATE DATABASE 'Syslog' WITH ENCODING 'SQL_ASCII'; \c Syslog; CREATE TABLE SystemEvents ( |