Merge pull request #123 from pali/master

Fix warning message in test t/55utf8.t for MariaDB 10.2.20+, 10.3.12+ and 10.4.1+

Author: holcapek

.travis.yml

@@ -246,6 +246,10 @@ matrix:
       env: DB=MariaDB VERSION=10.2.18
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.2.19
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.2.20
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.2.21
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.3.0
     - perl: "5.22"
@@ -266,8 +270,12 @@ matrix:
       env: DB=MariaDB VERSION=10.3.10
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.3.11
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.3.12
     - perl: "5.22"
       env: DB=MariaDB VERSION=10.4.0
+    - perl: "5.22"
+      env: DB=MariaDB VERSION=10.4.1
     - perl: "5.22"
       env: CONC_DB=MySQL CONC_VERSION=6.0.0-beta
     - perl: "5.22"

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';