upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-08 23:32:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Use MARIADB_BASE_VERSION instead of LIBMARIADB to detect Maria DB [v9.18]

See merge request isc-projects/bind9!6225
This commit is contained in:
Ondřej Surý 2022-04-28 16:06:20 +00:00
commit 982103594c
2 changed files with 4 additions and 4 deletions
Show stats 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_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

4
contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
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