Merge ~ahasenack/ubuntu/+source/apr-util:eoan-dbd-mysql-module-load into ubuntu/+source/apr-util:ubuntu/devel

[Andreas Hasenack]

Fix loading the mysql dbd module.

Testing instructions are in the linked bug.

I pinged Lars in #ubuntu-devel and he agreed my_init() shouldn't be needed at all.

PPA for testing: https://launchpad.net/~ahasenack/+archive/ubuntu/mysql8-my-init/

Note that eoan's mysql8 still export my_bool.

Unmerged commits

312ea47... by Andreas Hasenack on 2020-03-04

update-metadata

08ee360... by Andreas Hasenack on 2020-03-04

changelog

3801058... by Andreas Hasenack on 2020-03-04

  * d/p/mysql8-my_init.patch: don't call my_init() since it's not
    exported anymore since MySQL 8.0.2 (LP: #1859773)

diff --git a/debian/changelog b/debian/changelog
index 75eba76..137ec01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 apr-util (1.6.1-4ubuntu1) focal; urgency=medium
 
   * Adjust Build-Depends to unambiguously require Python 2.
@@ -5,6 +6,14 @@ apr-util (1.6.1-4ubuntu1) focal; urgency=medium
     (LP: #1863026)
 
  -- Robie Basak <[e-mail]>  Tue, 18 Feb 2020 14:53:49 +0000
+=======
+apr-util (1.6.1-4ubuntu0.1) eoan; urgency=medium
+
+  * d/p/mysql8-my_init.patch: don't call my_init() since it's not
+    exported anymore since MySQL 8.0.2 (LP: #1859773)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 04 Mar 2020 17:00:31 -0300
+>>>>>>> debian/changelog
 
 apr-util (1.6.1-4build1) eoan; urgency=medium
 
diff --git a/debian/patches/mysql8-my_init.patch b/debian/patches/mysql8-my_init.patch
 new file mode 100644
index 0000000..3be2139
--- /dev/null
+++ b/debian/patches/mysql8-my_init.patch
@@ -0,0 +1,23 @@
+Description: don't call my_init()
+ Since MySQL 8.0.2, my_init() isn't exported anymore and shouldn't have to be
+ called by clients directly. See
+ https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-2.html
+Author: Andreas Hasenack <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/apache2/+bug/1859773
+Forwarded: no
+X-Forwarded-Reason: Should have an explicit check for MySQL 8.0.2
+Last-Update: 2020-03-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/dbd/apr_dbd_mysql.c
++++ b/dbd/apr_dbd_mysql.c
+@@ -1263,9 +1263,6 @@
+ 
+ static void dbd_mysql_init(apr_pool_t *pool)
+ {
+-#if MYSQL_VERSION_ID < 100000
+-    my_init();
+-#endif
+     mysql_thread_init();
+ 
+     /* FIXME: this is a guess; find out what it really does */
diff --git a/debian/patches/series b/debian/patches/series
index 3e71f6a..aafb7a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,8 @@ fix_doxygen_inputdir
 support_mariadb.patch
 doxygen_no_ful_path_names.patch
 fix_gdbm_error_handling
+<<<<<<< debian/patches/series
 mysql8_my_bool.patch
+=======
+mysql8-my_init.patch
+>>>>>>> debian/patches/series