diff -pruN 1.21-1/debian/changelog 1.21-1ubuntu2/debian/changelog
--- 1.21-1/debian/changelog	2019-12-21 19:21:37.000000000 +0000
+++ 1.21-1ubuntu2/debian/changelog	2020-11-11 16:03:38.000000000 +0000
@@ -1,3 +1,19 @@
+libdbd-mariadb-perl (1.21-1ubuntu2) hirsute; urgency=medium
+
+  * Adjust test case expectation that works with either 8.0.22+ or prior
+    mysql versions. https://github.com/gooddata/DBD-MariaDB/issues/160
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 11 Nov 2020 16:03:38 +0000
+
+libdbd-mariadb-perl (1.21-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+  * Changes required for the MySQL 8.0 transition:
+    - Avoid IDENTIFIED BY on GRANT.
+    - GRANT SESSION_VARIABLES_ADMIN as required by MySQL >= 8.0.14.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 10 Nov 2020 14:07:21 +0000
+
 libdbd-mariadb-perl (1.21-1) unstable; urgency=medium
 
   * Team upload.
@@ -31,6 +47,20 @@ libdbd-mariadb-perl (1.11-4) unstable; u
 
  -- gregor herrmann <gregoa@debian.org>  Sat, 12 Oct 2019 23:50:58 +0200
 
+libdbd-mariadb-perl (1.11-3ubuntu2) focal; urgency=medium
+
+  * No-change rebuild for the perl update.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 19 Oct 2019 08:03:18 +0000
+
+libdbd-mariadb-perl (1.11-3ubuntu1) eoan; urgency=medium
+
+  * Changes required for the MySQL 8.0 transition:
+    - Avoid IDENTIFIED BY on GRANT.
+    - GRANT SESSION_VARIABLES_ADMIN as required by MySQL >= 8.0.14.
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Tue, 30 Jul 2019 11:29:45 +0000
+
 libdbd-mariadb-perl (1.11-3) unstable; urgency=medium
 
   * Team upload.
@@ -117,3 +147,4 @@ libdbd-mariadb-perl (1.00-1) unstable; u
     - set utf8 in db creation to enable more tests
 
  -- Xavier Guimard <x.guimard@free.fr>  Thu, 23 Aug 2018 20:54:16 +0200
+
diff -pruN 1.21-1/debian/control 1.21-1ubuntu2/debian/control
--- 1.21-1/debian/control	2019-12-21 19:21:37.000000000 +0000
+++ 1.21-1ubuntu2/debian/control	2019-12-21 22:21:22.000000000 +0000
@@ -1,5 +1,6 @@
 Source: libdbd-mariadb-perl
-Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
 Uploaders: Xavier Guimard <yadd@debian.org>
 Section: perl
 Testsuite: autopkgtest-pkg-perl
diff -pruN 1.21-1/debian/patches/fix-mysql-8.0.22.patch 1.21-1ubuntu2/debian/patches/fix-mysql-8.0.22.patch
--- 1.21-1/debian/patches/fix-mysql-8.0.22.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.21-1ubuntu2/debian/patches/fix-mysql-8.0.22.patch	2020-11-11 16:03:38.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Adjust test case expectation that works with either 8.0.22+ or prior mysql versions.
+Bug: https://github.com/gooddata/DBD-MariaDB/issues/160
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+
+--- libdbd-mariadb-perl-1.21.orig/t/rt122541-decimals.t
++++ libdbd-mariadb-perl-1.21/t/rt122541-decimals.t
+@@ -14,6 +14,6 @@ plan tests => 2;
+ 
+ for my $mariadb_server_prepare (0, 1) {
+ 	$dbh->{mariadb_server_prepare} = $mariadb_server_prepare;
+-	is $dbh->selectrow_arrayref('SELECT round(degrees(0.00043) * 69, 2)')->[0], '1.70',
++	like $dbh->selectrow_arrayref('SELECT round(degrees(0.00043) * 69, 2)')->[0], qr/1.70?/,
+ 		'floats with fixed-length of decimals returns correct value for mariadb_server_prepare=' . $mariadb_server_prepare;
+ }
diff -pruN 1.21-1/debian/patches/series 1.21-1ubuntu2/debian/patches/series
--- 1.21-1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 1.21-1ubuntu2/debian/patches/series	2020-11-11 16:03:38.000000000 +0000
@@ -0,0 +1 @@
+fix-mysql-8.0.22.patch
diff -pruN 1.21-1/debian/tests/pkg-perl/smoke-setup 1.21-1ubuntu2/debian/tests/pkg-perl/smoke-setup
--- 1.21-1/debian/tests/pkg-perl/smoke-setup	2019-12-21 19:21:37.000000000 +0000
+++ 1.21-1ubuntu2/debian/tests/pkg-perl/smoke-setup	2019-12-21 22:21:23.000000000 +0000
@@ -25,9 +25,19 @@ while ! /usr/bin/mysqladmin --user=root
 	fi
 done
 
-mysql --user=root --socket=${MYSQL_UNIX_PORT} --execute "CREATE USER '${DBD_MARIADB_TESTUSER}'@'localhost';" 2>&1
+mysql --user=root --socket=${MYSQL_UNIX_PORT} --execute "CREATE USER '${DBD_MARIADB_TESTUSER}'@'localhost' IDENTIFIED BY '${DBD_MARIADB_TESTPASSWORD}';" 2>&1
 mysql --user=root --socket=${MYSQL_UNIX_PORT} --execute "CREATE DATABASE IF NOT EXISTS ${DBD_MARIADB_TESTDB} CHARACTER SET='utf8mb4';" 2>&1
-mysql --user=root --socket=${MYSQL_UNIX_PORT} --execute "GRANT ALL PRIVILEGES ON ${DBD_MARIADB_TESTDB}.* TO '${DBD_MARIADB_TESTUSER}'@'localhost' IDENTIFIED BY '${DBD_MARIADB_TESTPASSWORD}';" 2>&1
+mysql --user=root --socket=${MYSQL_UNIX_PORT} --execute "GRANT ALL PRIVILEGES ON ${DBD_MARIADB_TESTDB}.* TO '${DBD_MARIADB_TESTUSER}'@'localhost';" 2>&1
+mysql_version=`mysql --user=root --socket=${MYSQL_UNIX_PORT} -NBe 'SELECT @@version;'`
+if ! echo "$mysql_version" | grep -q MariaDB; then
+	# On MySQL >= 8.0.14 setting auto_increment_offset is a privileged
+	# operation and requires SESSION_VARIABLES_ADMIN globally. Some tests
+	# require this operation. This is not privileged on MariaDB and so it
+	# presumably doesn't understand SESSION_VARIABLES_ADMIN either.
+	if dpkg --compare-versions "$mysql_version" ge 8.0.14; then
+		mysql --user=root --socket=${MYSQL_UNIX_PORT} --execute "GRANT SESSION_VARIABLES_ADMIN ON *.* TO '${DBD_MARIADB_TESTUSER}'@'localhost';" 2>&1
+	fi
+fi
 
 if ! /usr/bin/mysqladmin --user=${DBD_MARIADB_TESTUSER} --password=${DBD_MARIADB_TESTPASSWORD} --socket=${DBD_MARIADB_TESTSOCKET} ping 2>&1; then
 	echo "skipping test, cannot connect to server with test user"