Attachment 183387 Details for Bug 219788 – svn diff for databases/p5-DBD-mysql

[patch] svn diff for databases/p5-DBD-mysql

patch-databases_p5-DBD-mysql-MariaDB10.2 (text/plain), 1.60 KB, created by Bernard Spil on 2017-06-10 15:33:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-06-10 15:33:32 UTC

Size: 1.60 KB

patch

obsolete

>Index: files/patch-dbdimp.c
>===================================================================
>--- files/patch-dbdimp.c	(nonexistent)
>+++ files/patch-dbdimp.c	(working copy)
>@@ -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 {
>+       /* 
>
>Property changes on: files/patch-dbdimp.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 219788: 183224 | 183259 | 183383 | 183387