From c9a8c6732a3cad7016fe0cbf217a9f0846af6bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Tue, 19 Dec 2017 09:51:47 +0100
Subject: [PATCH] Fix building against mariadb-5.5.56

---
 ...-Fix-build-failures-for-MariaDB-10.2.patch | 36 +++++++++----------
 perl-DBD-MySQL.spec                           |  5 ++-
 2 files changed, 20 insertions(+), 21 deletions(-)

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 e0160a6..571e357 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
@@ -1,16 +1,24 @@
-From 60d57caa60ee925b3596c45c461ae260a2550502 Mon Sep 17 00:00:00 2001
+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 +++++++
- dbdimp.h | 1 +
  mysql.xs | 4 ++--
- 3 files changed, 10 insertions(+), 2 deletions(-)
+ 2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/dbdimp.c b/dbdimp.c
-index 9b8b313..fa628b0 100644
+index 71251da..97fa9c4 100644
 --- a/dbdimp.c
 +++ b/dbdimp.c
 @@ -1979,6 +1979,9 @@ MYSQL *mysql_dr_connect(
@@ -35,23 +43,11 @@ index 9b8b313..fa628b0 100644
      }
      else {
        /* 
-diff --git a/dbdimp.h b/dbdimp.h
-index 935256e..3a5fcaa 100644
---- a/dbdimp.h
-+++ b/dbdimp.h
-@@ -20,6 +20,7 @@
- #include <DBIXS.h>  /* installed by the DBI module                        */
- #include <mysql.h>  /* Comes with MySQL-devel */
- #include <mysqld_error.h>  /* Comes MySQL */
-+#include <mariadb_version.h> /* Comes with MariaDB Connector C */
- 
- #include <errmsg.h> /* Comes with MySQL-devel */
- 
 diff --git a/mysql.xs b/mysql.xs
-index 13c6a57..bb3622b 100644
+index 60cf9c6..750c763 100644
 --- a/mysql.xs
 +++ b/mysql.xs
-@@ -790,7 +790,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
+@@ -787,7 +787,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
      D_imp_dbh(dbh);
      IV type = 0;
      SV* retsv=NULL;
@@ -60,7 +56,7 @@ index 13c6a57..bb3622b 100644
  /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
      IV buffer_len;
  #endif 
-@@ -822,7 +822,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
+@@ -819,7 +819,7 @@ dbd_mysql_get_info(dbh, sql_info_type)
  	    retsv = newSVpvn("`", 1);
  	    break;
  	case SQL_MAXIMUM_STATEMENT_LENGTH:
@@ -70,5 +66,5 @@ index 13c6a57..bb3622b 100644
             only applies to MySQL*/
  	    /* mysql_get_option() was added in mysql 5.7.3 */
 -- 
-2.9.4
+2.13.6
 
diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec
index 336b42e..14e98e4 100644
--- a/perl-DBD-MySQL.spec
+++ b/perl-DBD-MySQL.spec
@@ -1,6 +1,6 @@
 Name:           perl-DBD-MySQL
 Version:        4.043
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A MySQL interface for Perl
 Group:          Development/Libraries
 License:        GPL+ or Artistic
@@ -86,6 +86,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete
 %{_mandir}/man3/*.3*
 
 %changelog
+* Tue Dec 19 2017 Petr Pisar <ppisar@redhat.com> - 4.043-7
+- Fix building against mariadb-5.5.56
+
 * Mon Dec 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4.043-6
 - Fixed CVE-2017-10789 (bug #1467600)