From owner-svn-ports-all@freebsd.org Tue Jan 23 09:51:55 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C62DEC6538; Tue, 23 Jan 2018 09:51:55 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 067EC717E9; Tue, 23 Jan 2018 09:51:55 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 446944F17; Tue, 23 Jan 2018 09:51:54 +0000 (UTC) (envelope-from vd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0N9psBM070170; Tue, 23 Jan 2018 09:51:54 GMT (envelope-from vd@FreeBSD.org) Received: (from vd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0N9prH8070167; Tue, 23 Jan 2018 09:51:53 GMT (envelope-from vd@FreeBSD.org) Message-Id: <201801230951.w0N9prH8070167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vd set sender to vd@FreeBSD.org using -f From: Vasil Dimov Date: Tue, 23 Jan 2018 09:51:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459735 - in head/databases/mysqlwsrep57-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: vd X-SVN-Commit-Paths: in head/databases/mysqlwsrep57-server: . files X-SVN-Commit-Revision: 459735 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 09:51:55 -0000 Author: vd Date: Tue Jan 23 09:51:53 2018 New Revision: 459735 URL: https://svnweb.freebsd.org/changeset/ports/459735 Log: databases/mysqlwsrep57-server: Fix compilation with Clang 6 Added: head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc (contents, props changed) head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc (contents, props changed) Modified: head/databases/mysqlwsrep57-server/Makefile Modified: head/databases/mysqlwsrep57-server/Makefile ============================================================================== --- head/databases/mysqlwsrep57-server/Makefile Tue Jan 23 09:40:49 2018 (r459734) +++ head/databases/mysqlwsrep57-server/Makefile Tue Jan 23 09:51:53 2018 (r459735) @@ -171,6 +171,14 @@ CMAKE_ARGS+= -DWITH_SSL=system CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} .endif +# ${LOCALBASE}/include/lz4.h does not compile with Clang 6. +# Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used. +.if ${OSVERSION} >= 1200056 +CFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS +CXXFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS -Wno-c++11-narrowing +LDFLAGS+= -L${LOCALBASE}/lib +.endif + post-extract: ${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h Added: head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc Tue Jan 23 09:51:53 2018 (r459735) @@ -0,0 +1,11 @@ +--- sql-common/client_authentication.cc.orig 2018-01-22 16:19:07.776289000 +0200 ++++ sql-common/client_authentication.cc 2018-01-22 16:19:26.756981000 +0200 +@@ -84,7 +84,7 @@ + + 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"); Added: head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc Tue Jan 23 09:51:53 2018 (r459735) @@ -0,0 +1,11 @@ +--- storage/innobase/row/row0sel.cc.orig 2018-01-22 18:12:31.679942000 +0200 ++++ storage/innobase/row/row0sel.cc 2018-01-22 18:12:55.834909000 +0200 +@@ -5193,7 +5193,7 @@ + reporting due to search views etc. */ + if (prev_rec != NULL + && prebuilt->m_mysql_handler->end_range != NULL +- && prebuilt->idx_cond == false && end_loop >= 100) { ++ && prebuilt->idx_cond == NULL && end_loop >= 100) { + + dict_index_t* key_index = prebuilt->index; + bool clust_templ_for_sec = false;