Date: Fri, 5 Jan 2018 10:55:47 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r458125 - in branches/2018Q1/databases: mysql56-client/files mysql56-server mysql56-server/files Message-ID: <201801051055.w05Atlw7026803@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Jan 5 10:55:47 2018 New Revision: 458125 URL: https://svnweb.freebsd.org/changeset/ports/458125 Log: MFH: r458124 databases/mysql56-server: unbreak build with Clang 6 (C++14 by default) sql-common/client_authentication.cc:87:56: error: comparison between pointer and integer ('char *' and 'int') mysql->options.extension->server_public_key_path != '\0') ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~ sql/sql_trigger.cc:195:5: error: non-constant-expression cannot be narrowed from type 'int' to 'size_t' (aka 'unsigned long') in initializer list [-Wc++11-narrowing] static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Reported by: antoine (via bug 224669) Approved by: ports-secteam blanket Added: branches/2018Q1/databases/mysql56-client/files/patch-sql-common_client__authentication.cc - copied unchanged from r458124, head/databases/mysql56-client/files/patch-sql-common_client__authentication.cc branches/2018Q1/databases/mysql56-server/files/patch-sql-common_client__authentication.cc - copied unchanged from r458124, head/databases/mysql56-server/files/patch-sql-common_client__authentication.cc Deleted: branches/2018Q1/databases/mysql56-server/files/patch-sql_sql_trigger.cc branches/2018Q1/databases/mysql56-server/files/patch-sql_sql_view.cc Modified: branches/2018Q1/databases/mysql56-server/Makefile Directory Properties: branches/2018Q1/ (props changed) Copied: branches/2018Q1/databases/mysql56-client/files/patch-sql-common_client__authentication.cc (from r458124, head/databases/mysql56-client/files/patch-sql-common_client__authentication.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/mysql56-client/files/patch-sql-common_client__authentication.cc Fri Jan 5 10:55:47 2018 (r458125, copy of r458124, head/databases/mysql56-client/files/patch-sql-common_client__authentication.cc) @@ -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"); Modified: branches/2018Q1/databases/mysql56-server/Makefile ============================================================================== --- branches/2018Q1/databases/mysql56-server/Makefile Fri Jan 5 10:54:41 2018 (r458124) +++ branches/2018Q1/databases/mysql56-server/Makefile Fri Jan 5 10:55:47 2018 (r458125) @@ -3,7 +3,7 @@ PORTNAME?= mysql PORTVERSION= 5.6.38 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.6 PKGNAMESUFFIX?= 56-server Copied: branches/2018Q1/databases/mysql56-server/files/patch-sql-common_client__authentication.cc (from r458124, head/databases/mysql56-server/files/patch-sql-common_client__authentication.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/databases/mysql56-server/files/patch-sql-common_client__authentication.cc Fri Jan 5 10:55:47 2018 (r458125, copy of r458124, head/databases/mysql56-server/files/patch-sql-common_client__authentication.cc) @@ -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");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801051055.w05Atlw7026803>