From 5835aae694a09d7f44e236df24a97d484108da46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Thu, 28 Apr 2022 13:37:40 +0200 Subject: [PATCH] Use MARIADB_BASE_VERSION instead of LIBMARIADB to detect Maria DB 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. --- contrib/dlz/modules/mysql/dlz_mysql_dynamic.c | 4 ++-- contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c index b31b687f0a..b92773e91b 100644 --- a/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c +++ b/contrib/dlz/modules/mysql/dlz_mysql_dynamic.c @@ -44,9 +44,9 @@ #include #include -#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 diff --git a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c index 8f089cfe7b..9af5a7e692 100644 --- a/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c +++ b/contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c @@ -56,9 +56,9 @@ #include #include -#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