diff -pruN 2.4.0-5/debian/changelog 2.4.0-5ubuntu3/debian/changelog
--- 2.4.0-5/debian/changelog	2019-05-10 20:19:13.000000000 +0000
+++ 2.4.0-5ubuntu3/debian/changelog	2022-01-20 14:33:47.000000000 +0000
@@ -1,3 +1,23 @@
+libodb-mysql (2.4.0-5ubuntu3) jammy; urgency=medium
+
+  * No-change rebuild for libodb C++17 compat
+
+ -- Lukas Märdian <slyon@ubuntu.com>  Thu, 20 Jan 2022 15:33:47 +0100
+
+libodb-mysql (2.4.0-5ubuntu2) focal; urgency=medium
+
+  * d/p/mysql8_my_bool.patch: Reintroduce my_bool to fix build with MySQL 8.
+    (LP: #1863026)
+
+ -- Andreas Hasenack <andreas@canonical.com>  Thu, 13 Feb 2020 13:53:04 -0300
+
+libodb-mysql (2.4.0-5ubuntu1) eoan; urgency=medium
+
+  * d/p/mysql-8.0: do not declare things defined by mysql.h as those
+    definitions have changed in MySQL 8.0. This fixes the FTBFS.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Tue, 16 Jul 2019 08:51:35 +0000
+
 libodb-mysql (2.4.0-5) unstable; urgency=medium
 
   [ Helmut Grohne <helmut@subdivi.de> ]
diff -pruN 2.4.0-5/debian/control 2.4.0-5ubuntu3/debian/control
--- 2.4.0-5/debian/control	2019-01-15 20:20:59.000000000 +0000
+++ 2.4.0-5ubuntu3/debian/control	2020-02-13 16:47:35.000000000 +0000
@@ -1,7 +1,8 @@
 Source: libodb-mysql
 Section: devel
 Priority: optional
-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
 Build-Depends: debhelper (>= 11), pkg-config, libodb-dev (>= 2.4.0), default-libmysqlclient-dev
 Standards-Version: 4.3.0
 Homepage: https://www.codesynthesis.com/products/odb
diff -pruN 2.4.0-5/debian/patches/mysql-8.0 2.4.0-5ubuntu3/debian/patches/mysql-8.0
--- 2.4.0-5/debian/patches/mysql-8.0	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-5ubuntu3/debian/patches/mysql-8.0	2020-02-13 16:47:35.000000000 +0000
@@ -0,0 +1,20 @@
+Description: do not redeclare things defined by mysql.h
+ This fixes the FTBFS with MySQL 8.0 as the definitions have changed.
+Author: Robie Basak <robie.basak@canonical.com>
+Origin: vendor
+Forwarded: no 
+X-Not-Forwarded-Reason: work still in progress
+Last-Update: 2018-07-16
+
+--- a/odb/mysql/mysql-types.hxx
++++ b/odb/mysql/mysql-types.hxx
+@@ -7,9 +7,6 @@
+ 
+ #include <odb/mysql/details/config.hxx>
+ 
+-typedef char my_bool;
+-typedef struct st_mysql_bind MYSQL_BIND;
+-
+ #ifdef LIBODB_MYSQL_INCLUDE_SHORT
+ #  include <mysql.h>
+ #else
diff -pruN 2.4.0-5/debian/patches/mysql8_my_bool.patch 2.4.0-5ubuntu3/debian/patches/mysql8_my_bool.patch
--- 2.4.0-5/debian/patches/mysql8_my_bool.patch	1970-01-01 00:00:00.000000000 +0000
+++ 2.4.0-5ubuntu3/debian/patches/mysql8_my_bool.patch	2020-02-13 16:52:35.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Reintroduce my_bool to fix build with MySQL 8
+Author: Andreas Hasenack <andreas@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gambas3/+bug/1863026
+Forwarded: no
+Last-Update: 2020-02-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/odb/mysql/mysql-types.hxx
++++ b/odb/mysql/mysql-types.hxx
+@@ -12,5 +12,6 @@
+ #else
+ #  include <mysql/mysql.h>
+ #endif
++typedef bool my_bool;
+ 
+ #endif // ODB_MYSQL_MYSQL_TYPES_HXX
diff -pruN 2.4.0-5/debian/patches/series 2.4.0-5ubuntu3/debian/patches/series
--- 2.4.0-5/debian/patches/series	2019-01-15 20:20:59.000000000 +0000
+++ 2.4.0-5ubuntu3/debian/patches/series	2020-02-13 16:51:37.000000000 +0000
@@ -1,2 +1,4 @@
 libmysqlclient_r
 mariadb_FTBFS_fix.patch
+mysql-8.0
+mysql8_my_bool.patch
