View | Details | Raw Unified | Return to bug 219788 | Differences between
and this patch

Collapse All | Expand All

(-)databases/p5-DBD-mysql/files/patch-dbdimp.c (+17 lines)
Line 0 Link Here
1
--- dbdimp.c.orig	2017-02-28 13:36:40 UTC
2
+++ dbdimp.c
3
@@ -2151,11 +2151,14 @@ MYSQL *mysql_dr_connect(
4
           imp_dbh->async_query_in_flight = NULL;
5
       }
6
 
7
+#ifndef MARIADB_BASE_VERSION
8
       /*
9
         we turn off Mysql's auto reconnect and handle re-connecting ourselves
10
         so that we can keep track of when this happens.
11
+        MariaDB's implementation does not have the reconnect member
12
       */
13
       result->reconnect=0;
14
+#endif
15
     }
16
     else {
17
       /* 
(-)databases/p5-DBD-mysql/files/patch-dbdimp.h (+10 lines)
Line 0 Link Here
1
--- dbdimp.h.orig	2017-02-28 13:36:40 UTC
2
+++ dbdimp.h
3
@@ -19,6 +19,7 @@
4
  */
5
 #include <DBIXS.h>  /* installed by the DBI module                        */
6
 #include <mysql.h>  /* Comes with MySQL-devel */
7
+#include <mysql_version.h> /* MariaDB does not include this in mysql.h */
8
 #include <mysqld_error.h>  /* Comes MySQL */
9
 
10
 #include <errmsg.h> /* Comes with MySQL-devel */

Return to bug 219788