Merge ~ahasenack/ubuntu/+source/apr-util:focal-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/

[Christian Ehrhardt  (paelzer)]

- as the other release -

Changes LGTM in both releases.
Thanks for checking with Lars on this.

The build looks good as well (BTW the documentation build misses "dot" as a dependency) but that is not part of your upload which I review.

Changelog LGTM as well.
Didn't find anything to correct.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 27670e9de8ada7ec0cfa576ec6ef749576c58980:

$ git push pkg upload/1.6.1-4ubuntu2
Enumerating objects: 16, done.
Counting objects: 100% (16/16), done.
Delta compression using up to 4 threads
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.75 KiB | 179.00 KiB/s, done.
Total 11 (delta 7), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/apr-util
 * [new tag] upload/1.6.1-4ubuntu2 -> upload/1.6.1-4ubuntu2

$ dput ubuntu ../apr-util_1.6.1-4ubuntu2_source.changes
Checking signature on .changes
gpg: ../apr-util_1.6.1-4ubuntu2_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../apr-util_1.6.1-4ubuntu2.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apr-util_1.6.1-4ubuntu2.dsc: done.
  Uploading apr-util_1.6.1-4ubuntu2.debian.tar.xz: done.
  Uploading apr-util_1.6.1-4ubuntu2_source.buildinfo: done.
  Uploading apr-util_1.6.1-4ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 75eba76..e4fb88c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apr-util (1.6.1-4ubuntu2) focal; 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 16:51:27 -0300
+
 apr-util (1.6.1-4ubuntu1) focal; urgency=medium
 
   * Adjust Build-Depends to unambiguously require Python 2.
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..8927119 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ support_mariadb.patch
 doxygen_no_ful_path_names.patch
 fix_gdbm_error_handling
 mysql8_my_bool.patch
+mysql8-my_init.patch