diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-20 17:35:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-20 17:35:36 +0100 |
commit | b620fb1b0929ff9657a2588aaa42b85e3021c102 (patch) | |
tree | 5c4e9e39b5d3ea7fc569c26b0d4ba6db582249e6 /dev-perl/DBD-mysql/files | |
parent | d473a706836012853193afc7000922601e4ada61 (diff) |
gentoo resync : 20.10.2017
Diffstat (limited to 'dev-perl/DBD-mysql/files')
-rw-r--r-- | dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch new file mode 100644 index 000000000000..13fa2775a3c4 --- /dev/null +++ b/dev-perl/DBD-mysql/files/4.041-mariadb-10.2.patch @@ -0,0 +1,35 @@ +From 509fd6a054de9408ce9032e93fff61f6bdbc568a Mon Sep 17 00:00:00 2001 +From: Brian Evans <grknight@gentoo.org> +Date: Fri, 13 Oct 2017 15:03:50 -0400 +Subject: Fix building/linking against MariaDB 10.2 + +Bug: https://bugs.gentoo.org/634192 +--- + mysql.xs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mysql.xs b/mysql.xs +index 13c6a57..6de3c8e 100644 +--- a/mysql.xs ++++ b/mysql.xs +@@ -790,7 +790,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 ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202 + /* 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) + retsv = newSVpvn("`", 1); + break; + case SQL_MAXIMUM_STATEMENT_LENGTH: +-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ++#if ( !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 50709 ) || MYSQL_VERSION_ID >= 100202 + /* 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.14.2 + |