Date: Tue, 11 Sep 2018 19:01:26 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479564 - head/databases/p5-DBD-mysql/files Message-ID: <201809111901.w8BJ1Qv9012004@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Tue Sep 11 19:01:26 2018 New Revision: 479564 URL: https://svnweb.freebsd.org/changeset/ports/479564 Log: Fix build with MariaDB PR: 231271 Submitted by: pi Added: head/databases/p5-DBD-mysql/files/ head/databases/p5-DBD-mysql/files/patch-dbdimp.c (contents, props changed) Added: head/databases/p5-DBD-mysql/files/patch-dbdimp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/p5-DBD-mysql/files/patch-dbdimp.c Tue Sep 11 19:01:26 2018 (r479564) @@ -0,0 +1,19 @@ +--- dbdimp.c.orig 2018-09-08 20:02:03 UTC ++++ dbdimp.c +@@ -1907,14 +1907,14 @@ MYSQL *mysql_dr_connect( + (SvTRUE(*svp) ? "utf8" : "latin1")); + } + +-#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) ++#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) + if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && *svp && SvTRUE(*svp)) { + my_bool server_get_pubkey = 1; + mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey); + } + #endif + +-#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) ++#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) + if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) { + STRLEN plen; + char *server_pubkey = SvPV(*svp, plen);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809111901.w8BJ1Qv9012004>