kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/mysqlwsrep57-server: Fix compilation with Clang 6

Browse source
This commit is contained in:
Vasil Dimov 2018-01-23 09:51:53 +00:00
parent 4d1df0588a
commit e2f106a61e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=459735
3 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
databases/mysqlwsrep57-server/Makefile
View file

@ -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

11
databases/mysqlwsrep57-server/files/patch-sql-common_client__authentication.cc Normal file
View file

@ -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");

11
databases/mysqlwsrep57-server/files/patch-storage_innobase_row_row0sel.cc Normal file
View file

@ -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;