devel/apr1: Unbreak with MySQL > 8.0.2 < 10.0.0

my_init() was removed from mysql 8.0.2, but dbd/apr_dbd_mysql.c calls
my_init() if MYSQL_VERSION_ID < 100000. This patch fixes this problem,
allowing Apache mod_authn_dbd.so to work properly on mysql >= 8.0.2.

There is an open bug upstream, but it has not been patched yet.

Upstream PR: https://bz.apache.org/bugzilla/show_bug.cgi?id=62631

PR:		274134
Approved by:	brnrd (with apache hat)
This commit is contained in:
Nick Hilliard 2025-09-17 11:30:09 +02:00 committed by Juraj Lutter
parent f824a5ab09
commit 1ba5f925f5
2 changed files with 12 additions and 1 deletions

View File

@ -1,6 +1,6 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= APACHE/apr
DISTFILES= apr-${APR_VERSION}.tar.gz \

View File

@ -0,0 +1,11 @@
--- apr-util-1.6.3/dbd/apr_dbd_mysql.c 2023-01-27 13:32:52.000000000 +0000
+++ apr-util-1.6.3/dbd/apr_dbd_mysql.c 2023-07-09 00:09:40.664437000 +0100
@@ -1262,7 +1262,7 @@
static void dbd_mysql_init(apr_pool_t *pool)
{
-#if MYSQL_VERSION_ID < 100000
+#if MYSQL_VERSION_ID < 80002
my_init();
#endif
mysql_thread_init();