diff -Nru libdbd-mariadb-perl-1.21/debian/changelog libdbd-mariadb-perl-1.21/debian/changelog --- libdbd-mariadb-perl-1.21/debian/changelog 2020-11-10 14:07:21.000000000 +0000 +++ libdbd-mariadb-perl-1.21/debian/changelog 2020-11-11 16:03:38.000000000 +0000 @@ -1,3 +1,10 @@ +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 Wed, 11 Nov 2020 16:03:38 +0000 + libdbd-mariadb-perl (1.21-1ubuntu1) hirsute; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru libdbd-mariadb-perl-1.21/debian/patches/fix-mysql-8.0.22.patch libdbd-mariadb-perl-1.21/debian/patches/fix-mysql-8.0.22.patch --- libdbd-mariadb-perl-1.21/debian/patches/fix-mysql-8.0.22.patch 1970-01-01 00:00:00.000000000 +0000 +++ libdbd-mariadb-perl-1.21/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 + +--- 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 -Nru libdbd-mariadb-perl-1.21/debian/patches/series libdbd-mariadb-perl-1.21/debian/patches/series --- libdbd-mariadb-perl-1.21/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libdbd-mariadb-perl-1.21/debian/patches/series 2020-11-11 16:03:38.000000000 +0000 @@ -0,0 +1 @@ +fix-mysql-8.0.22.patch