diff options
| author | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-07-22 14:20:57 +0000 |
|---|---|---|
| committer | Alexey Dokuchaev <danfe@FreeBSD.org> | 2020-07-22 14:20:57 +0000 |
| commit | 97de142e595104090b2b432b0348aed1100513c5 (patch) | |
| tree | 3bfa4b0c414c4f85b3fcacca738134b8d9e2c697 /mail/dspam/files/patch-src_mysql__drv.c | |
| parent | Revert r542851 and unbreak INDEX (diff) | |
Unbreak the build against MariaDB and MySQL 8.0 (the latter replaced
my_bool with C99 bool, while earlier versions used typedef to char).
PR: 243035
Diffstat (limited to 'mail/dspam/files/patch-src_mysql__drv.c')
| -rw-r--r-- | mail/dspam/files/patch-src_mysql__drv.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mail/dspam/files/patch-src_mysql__drv.c b/mail/dspam/files/patch-src_mysql__drv.c new file mode 100644 index 000000000000..a111ff821f55 --- /dev/null +++ b/mail/dspam/files/patch-src_mysql__drv.c @@ -0,0 +1,14 @@ +--- src/mysql_drv.c.orig 2012-04-11 18:48:33 UTC ++++ src/mysql_drv.c +@@ -3461,7 +3461,11 @@ MYSQL *_mysql_drv_connect (DSPAM_CTX *CTX, const char + snprintf(attrib, sizeof(attrib), "%sReconnect", prefix); + if (_ds_match_attribute(CTX->config->attributes, attrib, "true")) + { ++# if MYSQL_VERSION_ID < 80000 || defined(MARIADB_VERSION_ID) + my_bool reconnect = 1; ++# else ++ bool reconnect = 1; ++# endif + mysql_options(dbh, MYSQL_OPT_RECONNECT, &reconnect); + } + #endif |