upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-03-02 05:20:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Typedef my_bool if missing.

Browse source 
ORACLE MySQL 8.0 has dropped the my_bool type, so we need to reinstate
it back when compiling with that version or higher.  MariaDB is still
keeping the my_bool type.  The numbering between the two (MariaDB 5.x
jumped to MariaDB 10.x) doesn't make the life of the developer easy.

(cherry picked from commit c6d5d5c88f)
This commit is contained in:
Mark Andrews 2020-03-16 16:44:51 +11:00
parent 5f6b54927e
commit 3387fa03e4
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/dlz/drivers/dlz_mysql_driver.c
View file

@ -62,6 +62,10 @@
#include <dlz/sdlz_helper.h>
#include <named/globals.h>
#if !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000
typedef bool my_bool;
#endif /* !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 */
static dns_sdlzimplementation_t *dlz_mysql = NULL;
#define dbc_search_limit 30

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

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

9
contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c
View file

@ -61,6 +61,10 @@
#include <dlz_minimal.h>
#include <dlz_pthread.h>
#if !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000
typedef bool my_bool;
#endif /* !defined(LIBMARIADB) && MYSQL_VERSION_ID >= 80000 */
/*
* The SQL queries that will be used for lookups and updates are defined
* here. They will be processed into queries by the build_query()
@ -1020,7 +1024,10 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
*/
if (mysql_thread_safe()) {
for (n = 0; n < MAX_DBI; n++) {
#if MYSQL_VERSION_ID >= 50000
my_bool opt = 1;
#endif
dlz_mutex_init(&state->db[n].mutex, NULL);
dlz_mutex_lock(&state->db[n].mutex);
state->db[n].id = n;
@ -1028,8 +1035,10 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[], void **dbdata,
state->db[n].sock = mysql_init(NULL);
mysql_options(state->db[n].sock,
MYSQL_READ_DEFAULT_GROUP, modname);
#if MYSQL_VERSION_ID >= 50000
mysql_options(state->db[n].sock, MYSQL_OPT_RECONNECT,
&opt);
#endif
dlz_mutex_unlock(&state->db[n].mutex);
}