aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2017-06-24 15:08:51 +0000
committerBernard Spil <brnrd@FreeBSD.org>2017-06-24 15:08:51 +0000
commitf34763af70ada87ce5f63f02edabbd78cc431e40 (patch)
tree7a0823ce693685d299739d4dadf76f72390a19fe /databases
parent3ad76a5dcb08f63acc8a1e1d66e5f3814350ba2e (diff)
downloadports-f34763af70ada87ce5f63f02edabbd78cc431e40.tar.gz
ports-f34763af70ada87ce5f63f02edabbd78cc431e40.zip
databases/p5-DBD-mysql: Fix issue with MariaDB 10.2
- Use method, don't access struct PR: 219788 Reported by: Alexey <fbsd98816551@avksrv.org>
Notes
Notes: svn path=/head/; revision=444213
Diffstat (limited to 'databases')
-rw-r--r--databases/p5-DBD-mysql/files/patch-dbdimp.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/databases/p5-DBD-mysql/files/patch-dbdimp.c b/databases/p5-DBD-mysql/files/patch-dbdimp.c
new file mode 100644
index 000000000000..a6b71dc3bd13
--- /dev/null
+++ b/databases/p5-DBD-mysql/files/patch-dbdimp.c
@@ -0,0 +1,32 @@
+From 9ea49043522f1f1387384edf42ced7ad3ec44d3a Mon Sep 17 00:00:00 2001
+From: Georg Richter <georg@mariadb.com>
+Date: Sun, 28 May 2017 15:22:09 +0200
+Subject: [PATCH] Fix for builing DBD-mysql together with MariaDB Connector/C.
+ Use mysql_option function instead of accessing internal members of MYSQL
+ structure.
+
+---
+ dbdimp.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dbdimp.c b/dbdimp.c
+index da428ed..763b9fa 100644
+--- dbdimp.c.orig 2017-02-28 13:36:40 UTC
++++ dbdimp.c
+@@ -2139,6 +2139,7 @@ MYSQL *mysql_dr_connect(
+
+ if (result)
+ {
++ my_bool reconnect= 0;
+ #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
+ /* connection succeeded. */
+ /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs
+@@ -2155,7 +2156,7 @@ 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.
+ */
+- result->reconnect=0;
++ mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect);
+ }
+ else {
+ /*