Attachment #207204 for bug #240345

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

Lines 2-10 Link Here

(-)Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= mysqlwsrep	4	PORTNAME= mysqlwsrep
5	PORTVERSION?= 5.6.44	5	PORTVERSION?= 5.6.45
6	DISTVERSIONPREFIX?= wsrep_	6	DISTVERSIONPREFIX?= wsrep_
7	DISTVERSIONSUFFIX?= -25.26	7	DISTVERSIONSUFFIX?= -25.27
8	PORTREVISION?= 1	8	PORTREVISION?= 1
9	CATEGORIES= databases ipv6	9	CATEGORIES= databases ipv6
10	PKGNAMESUFFIX= 56-server	10	PKGNAMESUFFIX= 56-server

Lines 1-5 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1563525011	1	TIMESTAMP = 1567524448
2	SHA256 (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 4a3671ad6eb2a71585e16f9f9acbec14cbf27eead41cf0dc9c2c8bac448120fe	2	SHA256 (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 670c622644a9a271db810b193eb7eea3693b5ec6e25c38a26e22cd1f4e551d73
3	SIZE (codership-mysql-wsrep-wsrep_5.6.44-25.26_GH0.tar.gz) = 32778456	3	SIZE (codership-mysql-wsrep-wsrep_5.6.45-25.27_GH0.tar.gz) = 32782117
4	SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0	4	SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
5	SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032	5	SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032




sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int')
      mysql->options.extension->server_public_key_path != '\0')
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~

Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4

--- sql-common/client_authentication.cc.orig	2017-09-13 15:49:17 UTC
+++ sql-common/client_authentication.cc
@@ -84,7 +84,7 @@ RSA *rsa_init(MYSQL *mysql)
 
   if (mysql->options.extension != NULL &&
       mysql->options.extension->server_public_key_path != NULL &&
-      mysql->options.extension->server_public_key_path != '\0')
+      mysql->options.extension->server_public_key_path[0] != '\0')
   {
     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
                         "r");

Return to bug 240345

Lines 1-17 Link Here

(-)files/patch-sql-common_client__authentication.cc (-17 lines)
1	sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int')
2	mysql->options.extension->server_public_key_path != '\0')
3	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~
4
5	Part of https://github.com/mysql/mysql-server/commit/db1bde79b1b4
6
7	--- sql-common/client_authentication.cc.orig 2017-09-13 15:49:17 UTC
8	+++ sql-common/client_authentication.cc
9	@@ -84,7 +84,7 @@ RSA rsa_init(MYSQL mysql)
10
11	if (mysql->options.extension != NULL &&
12	mysql->options.extension->server_public_key_path != NULL &&
13	- mysql->options.extension->server_public_key_path != '\0')
14	+ mysql->options.extension->server_public_key_path[0] != '\0')
15	{
16	pub_key_file= fopen(mysql->options.extension->server_public_key_path,
17	"r");