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

Fix building against mariadb-5.5.56

Browse Source
This commit is contained in:
Petr Písař 2017-12-19 09:51:47 +01:00
parent f9abbc81ab
commit c9a8c6732a
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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> From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Fri, 14 Jul 2017 14:13:50 +0200 Date: Fri, 14 Jul 2017 14:13:50 +0200
Subject: [PATCH] Fix build failures for MariaDB 10.2 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.c | 7 +++++++
dbdimp.h | 1 +
mysql.xs | 4 ++-- 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 diff --git a/dbdimp.c b/dbdimp.c
index 9b8b313..fa628b0 100644 index 71251da..97fa9c4 100644
--- a/dbdimp.c --- a/dbdimp.c
+++ b/dbdimp.c +++ b/dbdimp.c
@@ -1979,6 +1979,9 @@ MYSQL *mysql_dr_connect( @@ -1979,6 +1979,9 @@ MYSQL *mysql_dr_connect(
@ -35,23 +43,11 @@ index 9b8b313..fa628b0 100644
} }
else { 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 diff --git a/mysql.xs b/mysql.xs
index 13c6a57..bb3622b 100644 index 60cf9c6..750c763 100644
--- a/mysql.xs --- a/mysql.xs
+++ b/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); D_imp_dbh(dbh);
IV type = 0; IV type = 0;
SV* retsv=NULL; 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*/ /* MariaDB 10 is not MySQL source level compatible so this only applies to MySQL*/
IV buffer_len; IV buffer_len;
#endif #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); retsv = newSVpvn("`", 1);
break; break;
case SQL_MAXIMUM_STATEMENT_LENGTH: case SQL_MAXIMUM_STATEMENT_LENGTH:
@ -70,5 +66,5 @@ index 13c6a57..bb3622b 100644
only applies to MySQL*/ only applies to MySQL*/
/* mysql_get_option() was added in mysql 5.7.3 */ /* mysql_get_option() was added in mysql 5.7.3 */
-- --
2.9.4 2.13.6

5
perl-DBD-MySQL.spec
View File

@ -1,6 +1,6 @@
Name: perl-DBD-MySQL Name: perl-DBD-MySQL
Version: 4.043 Version: 4.043
Release: 6%{?dist} Release: 7%{?dist}
Summary: A MySQL interface for Perl Summary: A MySQL interface for Perl
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
@ -86,6 +86,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %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 * Mon Dec 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 4.043-6
- Fixed CVE-2017-10789 (bug #1467600) - Fixed CVE-2017-10789 (bug #1467600)