From 286759692f1d5c84da625d5c0ced374a2585e978 Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Tue, 11 Aug 2020 11:35:06 +0200
Subject: fix: mysql version detection

Fix detection macro and support mysql8+ my_bool deprecation. Fixes #6465.
---
 src/mysql/mysql.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/mysql/mysql.c')

diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index 713227068..4df1893c6 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -26,6 +26,12 @@
 #include <mysql/mysql.h>
 #include "gnunet_mysql_lib.h"
 
+#ifdef HAVE_MYSQL8
+  typedef bool MYSQL_BOOL;
+#else
+  typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this
+#endif
+
 /**
  * Maximum number of supported parameters for a prepared
  * statement.  Increase if needed.
@@ -220,7 +226,7 @@ iopen (struct GNUNET_MYSQL_Context *mc)
   char *mysql_user;
   char *mysql_password;
   unsigned long long mysql_port;
-  my_bool reconnect;
+  MYSQL_BOOL reconnect;
   unsigned int timeout;
 
   mc->dbf = mysql_init (NULL);
-- 
cgit v1.2.3