From bec43b53804ab420ba3f3652849114e42f40e16a Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 3 May 2012 13:48:46 +0200
Subject: ommysql: added support for new mysql_library_[init/exit]

---
 plugins/ommysql/ommysql.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'plugins/ommysql')

diff --git a/plugins/ommysql/ommysql.c b/plugins/ommysql/ommysql.c
index 01f6a844..7ff89f5a 100644
--- a/plugins/ommysql/ommysql.c
+++ b/plugins/ommysql/ommysql.c
@@ -318,7 +318,11 @@ ENDparseSelectorAct
 
 BEGINmodExit
 CODESTARTmodExit
+#	ifdef HAVE_MYSQL_LIBRARY_INIT
+	mysql_library_end();
+#	else
 	mysql_server_end();
+#	endif
 ENDmodExit
 
 
@@ -348,7 +352,13 @@ CODEmodInit_QueryRegCFSLineHdlr
 	CHKiRet(objUse(errmsg, CORE_COMPONENT));
 
 	/* we need to init the MySQL library. If that fails, we cannot run */
-	if(mysql_server_init(0, NULL, NULL)) {
+	if(
+#	ifdef HAVE_MYSQL_LIBRARY_INIT
+	   mysql_library_init(0, NULL, NULL)
+#	else
+	   mysql_server_init(0, NULL, NULL)
+#	endif
+	                                   ) {
 		errmsg.LogError(0, NO_ERRCODE, "ommysql: mysql_server_init() failed, plugin "
 		                "can not run");
 		ABORT_FINALIZE(RS_RET_ERR);
-- 
cgit