diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-11 11:35:06 +0200 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2020-08-11 11:35:25 +0200 |
commit | 286759692f1d5c84da625d5c0ced374a2585e978 (patch) | |
tree | 997953d000fbda96123811b8faa63ee428539edf /src/mysql/mysql.c | |
parent | c0349b05c9736151899fa7aae3231cc64fca2bc4 (diff) | |
download | gnunet-286759692f1d5c84da625d5c0ced374a2585e978.tar.gz gnunet-286759692f1d5c84da625d5c0ced374a2585e978.zip |
fix: mysql version detection
Fix detection macro and support mysql8+ my_bool deprecation. Fixes #6465.
Diffstat (limited to 'src/mysql/mysql.c')
-rw-r--r-- | src/mysql/mysql.c | 8 |
1 files changed, 7 insertions, 1 deletions
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 @@ | |||
26 | #include <mysql/mysql.h> | 26 | #include <mysql/mysql.h> |
27 | #include "gnunet_mysql_lib.h" | 27 | #include "gnunet_mysql_lib.h" |
28 | 28 | ||
29 | #ifdef HAVE_MYSQL8 | ||
30 | typedef bool MYSQL_BOOL; | ||
31 | #else | ||
32 | typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this | ||
33 | #endif | ||
34 | |||
29 | /** | 35 | /** |
30 | * Maximum number of supported parameters for a prepared | 36 | * Maximum number of supported parameters for a prepared |
31 | * statement. Increase if needed. | 37 | * statement. Increase if needed. |
@@ -220,7 +226,7 @@ iopen (struct GNUNET_MYSQL_Context *mc) | |||
220 | char *mysql_user; | 226 | char *mysql_user; |
221 | char *mysql_password; | 227 | char *mysql_password; |
222 | unsigned long long mysql_port; | 228 | unsigned long long mysql_port; |
223 | my_bool reconnect; | 229 | MYSQL_BOOL reconnect; |
224 | unsigned int timeout; | 230 | unsigned int timeout; |
225 | 231 | ||
226 | mc->dbf = mysql_init (NULL); | 232 | mc->dbf = mysql_init (NULL); |