From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Fri, 18 Aug 2017 13:57:19 +0000 (+0200)
Subject: Fixed compilation with mariadb-10.2
X-Git-Tag: exim-4_90_RC1~84
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/4f9f4be4611f9e11016c2662dca55293185b0bb5

Fixed compilation with mariadb-10.2

https://bugzilla.redhat.com/show_bug.cgi?id=1467312

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
Exim-merge-changes: added ChangeLog item (Phil Pennock)
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index abc4e9312..c97fdd156 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -148,6 +148,9 @@ JH/25 Use one-bit bitfields for flags in the "addr" data structure.  Previously
       if was a fixed-sized field and bitmask ops via macros; it is now more
       extensible.
 
+PP/07 GitHub PR 56: Apply MariaDB build fix.
+      Patch provided by Jaroslav Å karvada.
+
 
 Exim version 4.89
 -----------------
diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
index 5cf15af3a..ddc7dc841 100644
--- a/src/src/lookups/mysql.c
+++ b/src/src/lookups/mysql.c
@@ -13,6 +13,7 @@ functions. */
 #include "lf_functions.h"
 
 #include <mysql.h>       /* The system header */
+#include <mysql_version.h>
 
 
 /* Structure and anchor for caching connections. */