4.047 bump

.gitignore

@@ -28,3 +28,4 @@ DBD-mysql-4.017.tar.gz
 /DBD-mysql-4.044.tar.gz
 /DBD-mysql-4.045.tar.gz
 /DBD-mysql-4.046.tar.gz
+/DBD-mysql-4.047.tar.gz

DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch

@@ -1,71 +0,0 @@
-From 051748825e77172677d9e3b319b870c3c0a70a38 Mon Sep 17 00:00:00 2001
-From: Jitka Plesnikova <jplesnik@redhat.com>
-Date: Fri, 14 Jul 2017 14:13:50 +0200
-Subject: [PATCH] Fix build failures for MariaDB 10.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-<mariadb_version.h> does not exist in mariadb-5.5.26. Do not include
-it explicitly. Instead rely on including <mysql.h> that transitively
-includes <mariadb_version.h> or <mysql_version.h>. This makes this
-patch more portable.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- dbdimp.c | 7 +++++++
- mysql.xs | 4 ++--
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-# 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
-+++ b/mysql.xs
-@@ -787,7 +787,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
-     D_imp_dbh(dbh);
-     IV type = 0;
-     SV* retsv=NULL;
--#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
-+#if MYSQL_VERSION_ID >= 50709
- /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
-     IV buffer_len;
- #endif 
-@@ -819,7 +819,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
- 	    retsv = newSVpvn("`", 1);
- 	    break;
- 	case SQL_MAXIMUM_STATEMENT_LENGTH:
--#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709
-+#if MYSQL_VERSION_ID >= 50709
-         /* MariaDB 10 is not MySQL source level compatible so this
-            only applies to MySQL*/
- 	    /* mysql_get_option() was added in mysql 5.7.3 */
--- 
-2.13.6
-

DBD-mysql-4.047-Fix-build-failures-with-MariaDB.patch

@@ -0,0 +1,20 @@
+diff -up DBD-mysql-4.047/dbdimp.c.orig DBD-mysql-4.047/dbdimp.c
+--- DBD-mysql-4.047/dbdimp.c.orig	2018-09-11 15:12:38.921029672 +0200
++++ DBD-mysql-4.047/dbdimp.c	2018-09-11 15:21:44.512417303 +0200
+@@ -1907,14 +1907,14 @@ MYSQL *mysql_dr_connect(
+                          (SvTRUE(*svp) ? "utf8" : "latin1"));
+         }
+ 
+-#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION)
++#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID)
+         if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && *svp && SvTRUE(*svp)) {
+           my_bool server_get_pubkey = 1;
+           mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey);
+         }
+ #endif
+ 
+-#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION)
++#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID)
+         if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) {
+           STRLEN plen;
+           char *server_pubkey = SvPV(*svp, plen);

perl-DBD-MySQL.spec

@@ -1,13 +1,13 @@
 Name:           perl-DBD-MySQL
-Version:        4.046
+Version:        4.047
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        A MySQL interface for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/DBD-mysql
 Source0:        https://cpan.metacpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz
-# Fix for new version of MariaDB 10.2
+# Fix build with MariaDB
-Patch0:         DBD-mysql-4.043-Fix-build-failures-for-MariaDB-10.2.patch
+Patch0:         DBD-mysql-4.047-Fix-build-failures-with-MariaDB.patch
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
@@ -22,6 +22,7 @@ BuildRequires:  perl(Config)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(DBI) >= 1.609
 BuildRequires:  perl(DBI::DBD)
+BuildRequires:  perl(Devel::CheckLib) >= 1.09
 BuildRequires:  perl(DynaLoader)
 BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 BuildRequires:  perl(File::Basename)
@@ -73,6 +74,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Sep 10 2018 Jitka Plesnikova <jplesnik@redhat.com> - 4.047-1
+- 4.047 bump
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.046-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (DBD-mysql-4.046.tar.gz) = 57b3243a724ac21a11b6eea10aa1cfc821f295cb5bf44f9eaabeb979d3f8e1f7f5e00d40b144a16688d0a358c82c2bb00f630e925e176f29a9ca84b8ee7fb9cc
+SHA512 (DBD-mysql-4.047.tar.gz) = 78dff82bc81378abd5ded5cc7f720bbf703f9bd744571926d86083041a9822f8edf1d4dfc1280baf22fb8c7047be1485423d545e52a25593000c35b04175ee54