diff --git a/.gitignore b/.gitignore index 13b39ff..7118337 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ DBD-mysql-4.017.tar.gz /DBD-mysql-4.042.tar.gz /DBD-mysql-4.043.tar.gz /DBD-mysql-4.044.tar.gz +/DBD-mysql-4.045.tar.gz diff --git a/DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch b/DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch index 6e882b8..e61e305 100644 --- a/DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch +++ b/DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch @@ -17,32 +17,33 @@ Signed-off-by: Petr Písař mysql.xs | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) -diff --git a/dbdimp.c b/dbdimp.c -index 71251da..97fa9c4 100644 ---- a/dbdimp.c -+++ b/dbdimp.c -@@ -2104,6 +2104,9 @@ MYSQL *mysql_dr_connect( - - if (result) - { -+#if MYSQL_VERSION_ID >= 50013 -+ my_bool reconnect= 1; -+#endif - #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION - /* connection succeeded. */ - /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs -@@ -2122,7 +2125,11 @@ MYSQL *mysql_dr_connect( - we turn off Mysql's auto reconnect and handle re-connecting ourselves - so that we can keep track of when this happens. - */ -+#if MYSQL_VERSION_ID >= 50013 -+ mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect); -+#else - result->reconnect=0; -+#endif - } - else { - /* +# Fixed in 4.045 +#diff --git a/dbdimp.c b/dbdimp.c +#index 71251da..97fa9c4 100644 +#--- a/dbdimp.c +#+++ b/dbdimp.c +#@@ -2104,6 +2104,9 @@ MYSQL *mysql_dr_connect( +# +# if (result) +# { +#+#if MYSQL_VERSION_ID >= 50013 +#+ my_bool reconnect= 1; +#+#endif +# #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION +# /* connection succeeded. */ +# /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs +#@@ -2122,7 +2125,11 @@ MYSQL *mysql_dr_connect( +# we turn off Mysql's auto reconnect and handle re-connecting ourselves +# so that we can keep track of when this happens. +# */ +#+#if MYSQL_VERSION_ID >= 50013 +#+ mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect); +#+#else +# result->reconnect=0; +#+#endif +# } +# else { +# /* diff --git a/mysql.xs b/mysql.xs index 60cf9c6..750c763 100644 --- a/mysql.xs diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index dfa0a75..5a40592 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -1,5 +1,5 @@ Name: perl-DBD-MySQL -Version: 4.044 +Version: 4.045 Release: 1%{?dist} Summary: A MySQL interface for Perl Group: Development/Libraries @@ -22,7 +22,7 @@ BuildRequires: perl(Data::Dumper) BuildRequires: perl(DBI) >= 1.609 BuildRequires: perl(DBI::DBD) BuildRequires: perl(DynaLoader) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 BuildRequires: perl(File::Basename) BuildRequires: perl(File::Copy) BuildRequires: perl(File::Path) @@ -51,12 +51,11 @@ management system. find . -type f | xargs chmod -x %build -perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 make %{?_smp_mflags} %install make pure_install DESTDIR=%{buildroot} -find %{buildroot} -type f -name .packlist -delete find %{buildroot} -type f -name '*.bs' -empty -delete %{_fixperms} %{buildroot}/* @@ -73,6 +72,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete %{_mandir}/man3/*.3* %changelog +* Thu Feb 08 2018 Jitka Plesnikova - 4.045-1 +- 4.045 bump + * Tue Jan 23 2018 Jitka Plesnikova - 4.044-1 - 4.044 bump diff --git a/sources b/sources index defe496..cf1d6a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DBD-mysql-4.044.tar.gz) = e3dd9482e8f78c19dc91baba07e39e266f113ce5a014cfe6c5989c96ed0f85723a17ba6a6e00b65a1ed3c62362400bd3779eb63ed282f73587b4757da249af02 +SHA512 (DBD-mysql-4.045.tar.gz) = 7f73f6ce37df635bb860c5ab4be09d65db59dc637e9a2eb3b9a35682d9c2032ca848bbf3aa916ac97e065f380101bab4ff63a6132bfb8a5451018a43d88803fd