1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
|
From aab664921d377888c666ad4675722ae88e7d58af Mon Sep 17 00:00:00 2001
From: Pali <pali@cpan.org>
Date: Thu, 17 Jan 2019 09:47:06 +0100
Subject: [PATCH 1/2] Fix warning message in test t/55utf8.t for MariaDB
10.2.20+, 10.3.12+ and 10.4.1+
Bug: https://github.com/gooddata/DBD-MariaDB/issues/121
Bug-Debian: https://bugs.debian.org/919071
---
t/55utf8.t | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/55utf8.t b/t/55utf8.t
index cbea705..bf12869 100644
--- a/t/55utf8.t
+++ b/t/55utf8.t
@@ -80,7 +80,7 @@ ok $sth->finish;
cmp_ok($dbh->{mariadb_warning_count}, '==', 1, 'got warning for INSERT') or do { diag("SHOW WARNINGS:"); diag($_->[2]) foreach $dbh->selectall_array("SHOW WARNINGS", { mariadb_server_prepare => 0 }); };
my (undef, undef, $warning) = $dbh->selectrow_array("SHOW WARNINGS", { mariadb_server_prepare => 0 });
-like($warning, qr/^(?:Incorrect string value: '\\xC4\\x80dam'|Data truncated) for column 'ascii' at row 1$/, 'warning is correct');
+like($warning, qr/^(?:Incorrect string value: '\\xC4\\x80dam'|Data truncated) for column (?:'ascii'|`.*`\.`.*`\.`ascii`) at row 1$/, 'warning is correct');
# AsBinary() is deprecated as of MySQL 5.7.6, use ST_AsBinary() instead
my $asbinary = $dbh->{mariadb_serverversion} >= 50706 ? 'ST_AsBinary' : 'AsBinary';
|