rpms/perl-DBD-MariaDB
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix test for mariadb-connector-c 3.2.x

Browse Source
This commit is contained in:
Jitka Plesnikova 2022-02-17 14:59:03 +01:00
parent d7a9f4ce22
commit 7e598f4587
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DBD-MariaDB-fix-mariadb-connector-c-32x-test.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t.orig DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t
--- DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t.orig 2022-02-17 14:00:30.765461191 +0100
+++ DBD-MariaDB-1.21/t/45bind_no_backslash_escapes.t 2022-02-17 14:01:54.388057993 +0100
@@ -19,7 +19,8 @@ if ($dbh->{mariadb_serverversion} < 5000
plan skip_all => "Servers < 5.0.1 do not support sql_mode NO_BACKSLASH_ESCAPES";
}
-if ($dbh->{mariadb_clientversion} < 50001) {
+# As from mariadb-connect-c 3.2.x version number for mariadb_clientversion is 3020x
+if ($dbh->{mariadb_clientversion} < 50001 && $dbh->{mariadb_serverversion} < 50001) {
$id2_quoted_no_backslash = q(X'737472696E675C737472696E6722737472696E6727737472696E67');
}

9
perl-DBD-MariaDB.spec
View File

@ -9,7 +9,7 @@
Name: perl-DBD-MariaDB
Version: 1.21
Release: 15%{?dist}
Release: 16%{?dist}
Summary: MariaDB and MySQL driver for the Perl5 Database Interface (DBI)
License: GPL+ or Artistic
URL: https://metacpan.org/release/DBD-MariaDB/
@ -18,6 +18,9 @@ Source1: test-setup.t
Source2: test-clean.t
Source3: test-env.sh
Patch0: DBD-MariaDB-1.21-Run-test-setup-and-clean.patch
# Fix test for changed value of mariadb_clientversion
# mariadb-connector-c 3.2.x version number changed mariadb_clientversion to 3020x
Patch1: DBD-MariaDB-fix-mariadb-connector-c-32x-test.patch
BuildRequires: findutils
BuildRequires: gcc
BuildRequires: make
@ -106,6 +109,7 @@ with "%{_libexecdir}/%{name}/test".
%prep
%setup -q -n DBD-MariaDB-%{version}
%patch0 -p1
%patch1 -p1
cp %{SOURCE1} %{SOURCE2} t/
# Help file to recognise the Perl scripts and normalize shebangs
@ -170,6 +174,9 @@ make test %{?with_perl_DBD_MariaDB_enables_leak_test:EXTENDED_TESTING=1}
%{_libexecdir}/%{name}
%changelog
* Thu Feb 17 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.21-15
- Fix test for mariadb-connector-c 3.2.x
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild