svn commit: r459077 - head/databases/mysqlwsrep56-server/files

Vasil Dimov vd at FreeBSD.org
Mon Jan 15 16:31:20 UTC 2018


Author: vd
Date: Mon Jan 15 16:31:19 2018
New Revision: 459077
URL: https://svnweb.freebsd.org/changeset/ports/459077

Log:
  databases/mysqlwsrep56-server: fix compilation with Clang 6
  
  Similarly to what was done with databases/mysql56-server in r458124.

Added:
  head/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc   (contents, props changed)
Deleted:
  head/databases/mysqlwsrep56-server/files/patch-sql_sql__trigger.cc
  head/databases/mysqlwsrep56-server/files/patch-sql_sql__view.cc

Added: head/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysqlwsrep56-server/files/patch-sql-common_client__authentication.cc	Mon Jan 15 16:31:19 2018	(r459077)
@@ -0,0 +1,17 @@
+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");


More information about the svn-ports-all mailing list