ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '2813-build-named-with-dlz-is-broken-with-MariaDB-10-v9_16' into 'v9_16'

Browse Source 
Use MARIADB_BASE_VERSION instead of LIBMARIADB to detect Maria DB [v9.16]

See merge request isc-projects/bind9!6226
This commit is contained in:
Ondřej Surý
2022-04-28 16:07:13 +00:00
parent 7351da4f24 04c6d853c7
commit 9a2b1cf399
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/dlz/modules/mysql/dlz_mysql_dynamic.c
+2 -2
View File
@@ -44,9 +44,9 @@
#include <dlz_minimal.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;
#endif /* !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 */
#endif /* !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80000 */
#define dbc_search_limit 30
#define ALLNODES 1
contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
+2 -2
View File
@@ -56,9 +56,9 @@
#include <dlz_minimal.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;
#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