Attachment 183383 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.98 KB, created by Bernard Spil on 2017-06-10 13:57:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-06-10 13:57:58 UTC

Size: 1.98 KB

patch

obsolete

>Index: files/patch-dbdimp.c
>===================================================================
>--- files/patch-dbdimp.c	(nonexistent)
>+++ files/patch-dbdimp.c	(working copy)
>@@ -0,0 +1,17 @@
>+--- dbdimp.c.orig	2017-02-28 13:36:40 UTC
>++++ dbdimp.c
>+@@ -2154,8 +2154,14 @@ 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.
>++        MariaDB's implementation does not have the reconnect member
>+       */
>++#if MYSQL_VERSION_ID <= 50500
>+       result->reconnect=0;
>++#else
>++      my_bool reconnect= 1; /* enable reconnect */
>++      mysql_optionsv(result, MYSQL_OPT_RECONNECT, (void *)&reconnect);
>++#endif
>+     }
>+     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
>Index: files/patch-dbdimp.h
>===================================================================
>--- files/patch-dbdimp.h	(nonexistent)
>+++ files/patch-dbdimp.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- dbdimp.h.orig	2017-02-28 13:36:40 UTC
>++++ dbdimp.h
>+@@ -19,6 +19,7 @@
>+  */
>+ #include <DBIXS.h>  /* installed by the DBI module                        */
>+ #include <mysql.h>  /* Comes with MySQL-devel */
>++#include <mysql_version.h> /* MariaDB does not include this in mysql.h */
>+ #include <mysqld_error.h>  /* Comes MySQL */
>+ 
>+ #include <errmsg.h> /* Comes with MySQL-devel */
>
>Property changes on: files/patch-dbdimp.h
>___________________________________________________________________
>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