1 From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001
2 From: Andy Shaw <andy.shaw@qt.io>
3 Date: Wed, 27 Sep 2017 09:23:10 +0200
4 Subject: [PATCH] Extend the MariaDB define check to cover the later versions
7 Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1
9 src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
12 diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
13 index 6e428fb..b2d3e85 100644
14 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
15 +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
16 @@ -1159,14 +1159,14 @@ static void qLibraryInit()
17 # endif // MYSQL_VERSION_ID
18 #endif // Q_NO_MYSQL_EMBEDDED
20 -#ifdef MARIADB_BASE_VERSION
21 +#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID)
22 qAddPostRoutine(mysql_server_end);
26 static void qLibraryEnd()
28 -#if !defined(MARIADB_BASE_VERSION)
29 +#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
30 # if !defined(Q_NO_MYSQL_EMBEDDED)
31 # if MYSQL_VERSION_ID > 40000
32 # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003