summaryrefslogtreecommitdiffstats
path: root/plugins/ommysql/ommysql.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-02-24 14:52:49 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-02-24 14:52:49 +0100
commit924ceb305dc1dced54beaa6ffe4b72b9f2609c6a (patch)
tree1dd9c29e5bda8d7b6f4952827ffe9218bc060df4 /plugins/ommysql/ommysql.c
parent46d7840b2500fd4cd3044ad06481f27ce97ee2ad (diff)
parent24a36fd14226ccf5f139c07252f05f3db124604e (diff)
downloadrsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.gz
rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.tar.xz
rsyslog-924ceb305dc1dced54beaa6ffe4b72b9f2609c6a.zip
Merge branch 'beta'
Conflicts: ChangeLog Makefile.am configure.ac doc/manual.html
Diffstat (limited to 'plugins/ommysql/ommysql.c')
-rw-r--r--plugins/ommysql/ommysql.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 22abb1d2..ecf738a9 100644
--- a/plugins/ommysql/ommysql.c
+++ b/plugins/ommysql/ommysql.c
@@ -35,8 +35,7 @@
#include <signal.h>
#include <errno.h>
#include <time.h>
-#include <mysql/mysql.h>
-#include <mysql/errmsg.h>
+#include <mysql.h>
#include "dirty.h"
#include "syslogd-types.h"
#include "srUtils.h"