rpms/perl-DBD-MySQL
6
0
Fork 0
Code Issues Pull Requests Releases Activity

4.038 bump

Browse Source
This commit is contained in:
Jitka Plesnikova 2016-10-20 17:39:15 +02:00
parent d2d434245c
commit 3d6cbd679e
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
DBD-mysql-4.038-Fix-condition-for-MariaDB.patch Normal file
View File

@ -0,0 +1,21 @@
diff -up DBD-mysql-4.038/mysql.xs.orig DBD-mysql-4.038/mysql.xs
--- DBD-mysql-4.038/mysql.xs.orig 2016-10-20 15:49:17.317483735 +0200
+++ DBD-mysql-4.038/mysql.xs 2016-10-20 15:50:17.261109698 +0200
@@ -882,7 +882,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
IV type = 0;
SV* retsv=NULL;
bool using_322=0;
-#if MYSQL_VERSION_ID >= 50709
+#if MYSQL_VERSION_ID >= 50709 && !defined(net_buffer_length)
IV buffer_len;
#endif
@@ -913,7 +913,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
retsv = newSVpv("`", 1);
break;
case SQL_MAXIMUM_STATEMENT_LENGTH:
-#if MYSQL_VERSION_ID >= 50709
+#if MYSQL_VERSION_ID >= 50709 && !defined(net_buffer_length)
/* mysql_get_option() was added in mysql 5.7.3 */
/* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */
mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len);

10
perl-DBD-MySQL.spec
View File

@ -1,11 +1,13 @@
Name: perl-DBD-MySQL
Version: 4.037
Version: 4.038
Release: 1%{?dist}
Summary: A MySQL interface for Perl
Group: Development/Libraries
License: GPL+ or Artistic
URL: http://search.cpan.org/dist/DBD-mysql/
Source0: http://www.cpan.org/authors/id/M/MI/MICHIELB/DBD-mysql-%{version}.tar.gz
Source0: http://www.cpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz
# The changes in DBD-mysql-4.038 break the build with current MariaDB
Patch0: DBD-mysql-4.038-Fix-condition-for-MariaDB.patch
BuildRequires: mariadb, mariadb-devel, zlib-devel
BuildRequires: coreutils
BuildRequires: findutils
@ -40,6 +42,7 @@ management system.
%prep
%setup -q -n DBD-mysql-%{version}
%patch0 -p1
# Correct file permissions
find . -type f | xargs chmod -x
@ -67,6 +70,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete
%{_mandir}/man3/*.3*
%changelog
* Thu Oct 20 2016 Jitka Plesnikova <jplesnik@redhat.com> - 4.038-1
- 4.038 bump
* Mon Oct 03 2016 Jitka Plesnikova <jplesnik@redhat.com> - 4.037-1
- 4.037 bump