diff options
| author | brnrd <brnrd@FreeBSD.org> | 2017-06-24 23:08:51 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2017-06-24 23:08:51 +0800 |
| commit | 096358f366f7c58166d982106f84cd5f033dc0bf (patch) | |
| tree | 7a0823ce693685d299739d4dadf76f72390a19fe /databases | |
| parent | 505ec686f3146c762ae8eb604df32af0c73f110a (diff) | |
| download | freebsd-ports-gnome-096358f366f7c58166d982106f84cd5f033dc0bf.tar.gz freebsd-ports-gnome-096358f366f7c58166d982106f84cd5f033dc0bf.tar.zst freebsd-ports-gnome-096358f366f7c58166d982106f84cd5f033dc0bf.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>
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/p5-DBD-mysql/files/patch-dbdimp.c | 32 |
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 { + /* |