svn commit: r459735 - in head/databases/mysqlwsrep57-server: . files
Vasil Dimov
vd at FreeBSD.org
Tue Jan 23 09:51:55 UTC 2018
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;
More information about the svn-ports-all
mailing list