Merge ~ahasenack/ubuntu/+source/apr-util:eoan-dbd-mysql-module-load into ubuntu/+source/apr-util:ubuntu/eoan-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.

[Christian Ehrhardt  (paelzer)]

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 312ea47bbbda4898189136b35156f1329a61e39c

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

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

[Andreas Hasenack (ahasenack)]

This migrated.

diff --git a/debian/changelog b/debian/changelog
index d722f4b..33c6d70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
+
 apr-util (1.6.1-4build1) eoan; urgency=medium
 
   * No change rebuild for libmysqlclient21.
diff --git a/debian/control b/debian/control
index 42a112d..994dd5f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: apr-util
 Section: libs
 Priority: optional
-Maintainer: Debian Apache Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Apache Maintainers <[e-mail]>
 Uploaders: Stefan Fritsch <[e-mail]>
 Build-Depends: debhelper (>> 11~), autoconf, mawk, libldap2-dev, libexpat1-dev, libdb-dev, libgdbm-dev, libapr1-dev (>> 1.4.8-2~), libsqlite3-dev, libpq-dev, python:any, default-libmysqlclient-dev, unixodbc-dev, doxygen, libssl-dev
 Standards-Version: 4.1.3
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 f1d8f4c..49aedad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ fix_doxygen_inputdir
 support_mariadb.patch
 doxygen_no_ful_path_names.patch
 fix_gdbm_error_handling
+mysql8-my_init.patch