Attachment #196990 for bug #231271

View | Details | Raw Unified | Return to bug 231271
Collapse All | Expand All

Lines 2-8 Link Here

(-)Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= DBD-mysql	4	PORTNAME= DBD-mysql
5	PORTVERSION= 4.046	5	PORTVERSION= 4.047
6	CATEGORIES= databases perl5	6	CATEGORIES= databases perl5
7	MASTER_SITES= CPAN	7	MASTER_SITES= CPAN
8	MASTER_SITE_SUBDIR= CPAN:CAPTTOFU	8	MASTER_SITE_SUBDIR= CPAN:CAPTTOFU

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1518182955	1	TIMESTAMP = 1536502622
2	SHA256 (DBD-mysql-4.046.tar.gz) = 6165652ec959d05b97f5413fa3dff014b78a44cf6de21ae87283b28378daf1f7	2	SHA256 (DBD-mysql-4.047.tar.gz) = 9a56d1b93a9748c25be6486075a72c416d66f61b8bb6e54492fa6408f2fbb145
3	SIZE (DBD-mysql-4.046.tar.gz) = 155294	3	SIZE (DBD-mysql-4.047.tar.gz) = 157309




--- dbdimp.c.orig	2018-09-09 20:15:04.611016000 +0200
+++ dbdimp.c	2018-09-09 20:15:37.234721000 +0200
@@ -1907,14 +1907,14 @@
                          (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);

Return to bug 231271

Line 0 Link Here

(-)files/patch-dbdimp.c (+19 lines)
	1	--- dbdimp.c.orig 2018-09-09 20:15:04.611016000 +0200
	2	+++ dbdimp.c 2018-09-09 20:15:37.234721000 +0200
	3	@@ -1907,14 +1907,14 @@
	4	(SvTRUE(*svp) ? "utf8" : "latin1"));
	5	}
	6
	7	-#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION)
	8	+#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID)
	9	if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && svp && SvTRUE(svp)) {
	10	my_bool server_get_pubkey = 1;
	11	mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey);
	12	}
	13	#endif
	14
	15	-#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION)
	16	+#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID)
	17	if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) {
	18	STRLEN plen;
	19	char server_pubkey = SvPV(svp, plen);