mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 16:15:27 +00:00
Code Issues Releases Wiki Activity

Use MARIADB_BASE_VERSION instead of LIBMARIADB to detect Maria DB

Browse Source 
It was discovered that MariaDB 10 didn't define LIBMARIADB leading
to compilation errors of MySQL DLZ modules on Debian stretch.

Use MARIADB_BASE_VERSION instead which is defined in all tested MariaDB
versions.
This commit is contained in:
Ondřej Surý
2022-04-28 13:37:40 +02:00
parent f4139bbbc4
commit 5835aae694
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/dlz/modules/mysql/dlz_mysql_dynamic.c
View File

@@ -44,9 +44,9 @@
#include <dlz_minimal.h> #include <dlz_minimal.h>
#include <dlz_pthread.h> #include <dlz_pthread.h>
#if !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 #if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000
typedef bool my_bool; typedef bool my_bool;
#endif /* !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 */ #endif /* !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000 */
#define dbc_search_limit 30 #define dbc_search_limit 30
#define ALLNODES 1 #define ALLNODES 1

4
contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
View File

@@ -56,9 +56,9 @@
#include <dlz_minimal.h> #include <dlz_minimal.h>
#include <dlz_pthread.h> #include <dlz_pthread.h>
#if !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 #if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000
typedef bool my_bool; typedef bool my_bool;
#endif /* !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 */ #endif /* !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000 */
/* /*
* The SQL queries that will be used for lookups and updates are defined * The SQL queries that will be used for lookups and updates are defined