...
 
Commits (3)
  • Mark Andrews's avatar
    remove unused variable · 95da2ffa
    Mark Andrews authored
    (cherry picked from commit 7af9883b)
    95da2ffa
  • Mark Andrews's avatar
    Typedef my_bool if missing. · 779d4995
    Mark Andrews authored
    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 c6d5d5c8)
    779d4995
  • Mark Andrews's avatar
    Merge branch... · c4b4a70d
    Mark Andrews authored
    Merge branch '1678-bind-fails-to-build-with-mysql-support-against-mysql8-mysql-connector-8-v9_11' into 'v9_11'
    
    Resolve "BIND fails to build with MYSQL support against mysql8/mysql-connector-8"
    
    See merge request !3306
    c4b4a70d
......@@ -66,6 +66,10 @@
#include <mysql.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
......
......@@ -57,6 +57,9 @@
#include <dlz_pthread.h>
#include <mysql/mysql.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
......
......@@ -60,6 +60,10 @@
#include <dlz_list.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()
......
......@@ -883,9 +883,6 @@ dlz_create(const char *dlzname, unsigned int argc, char *argv[],
char *tmp = NULL;
char *endp;
const char *helper_name;
#if SQLITE3_VERSION_ID >= 50000
my_bool auto_reconnect = 1;
#endif
#if PTHREADS
int dbcount;
int i, ret;
......