From f7d4c2561debcd92b96491e3adff53ef9a7e7525 Mon Sep 17 00:00:00 2001 From: jk2 Date: Wed, 30 Aug 2023 15:02:32 +0300 Subject: [PATCH] MYSQL_OPT_RECONNECT is deprecated in MySQL 8.0.34. --- dbd/apr_dbd_mysql.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbd/apr_dbd_mysql.c b/dbd/apr_dbd_mysql.c index 238d6f53ce..fcb5573f8f 100644 --- a/dbd/apr_dbd_mysql.c +++ b/dbd/apr_dbd_mysql.c @@ -1210,7 +1210,7 @@ static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params, } #endif -#if MYSQL_VERSION_ID >= 50013 +#if MYSQL_VERSION_ID >= 50013 && MYSQL_VERSION_ID < 80034 /* the MySQL manual says this should be BEFORE mysql_real_connect */ mysql_options(sql->conn, MYSQL_OPT_RECONNECT, &do_reconnect); #endif @@ -1228,7 +1228,7 @@ static apr_dbd_t *dbd_mysql_open(apr_pool_t *pool, const char *params, return NULL; } -#if MYSQL_VERSION_ID >= 50013 +#if MYSQL_VERSION_ID >= 50013 && MYSQL_VERSION_ID < 80034 /* Some say this should be AFTER mysql_real_connect */ mysql_options(sql->conn, MYSQL_OPT_RECONNECT, &do_reconnect); #endif