Index: head/databases/mysqlwsrep57-server/Makefile =================================================================== --- head/databases/mysqlwsrep57-server/Makefile (revision 516337) +++ head/databases/mysqlwsrep57-server/Makefile (revision 516338) @@ -1,208 +1,208 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.27 +PORTVERSION?= 5.7.28 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.19 -PORTREVISION?= 1 +DISTVERSIONSUFFIX?= -25.20 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES+= SF/boost/boost/1.59.0:boost PKGNAMESUFFIX= 57-server DISTFILES+= boost_1_59_0${EXTRACT_SUFX}:boost MAINTAINER= devel@galeracluster.com COMMENT= MySQL database enhanced with Galera replication (server package) LICENSE= GPLv2 RUN_DEPENDS= bash:shells/bash \ lsof:sysutils/lsof \ netcat:net/netcat \ rsync:net/rsync \ socat:net/socat LIB_DEPENDS= libevent.so:devel/libevent liblz4.so:archivers/liblz4 USES= bison \ cmake:noninja \ compiler:c++11-lib \ compiler:c11 \ libedit \ mysql:57 \ perl5 \ shebangfix \ ssl USE_PERL5= run MY_DBDIR= /var/db/mysql MY_SECDIR= /var/db/mysql_secure MY_TMPDIR= /var/db/mysql_tmpdir USE_GITHUB= yes GH_TUPLE?= codership:mysql-wsrep:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \ codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0:dummy/wsrep/src DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql NOT_FOR_ARCHS= i386 aarch64 armv6 armv7 powerpc64 NOT_FOR_ARCHS_REASON= Not supported platform CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \ -DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR="share/mysql/tests" \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \ -DWITH_BOOST="${WRKDIR}/boost_1_59_0" \ -DWITH_EDITLINE=system \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ -DINSTALL_MYSQLTESTDIR=0 \ -DDOWNLOAD_BOOST=1 \ -DWITH_WSREP=1 SHEBANG_FILES= scripts/*.pl* scripts/*.sh scripts/wsrep_sst_* .ifdef USE_MYSQL .error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again. .endif SUB_LIST= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} PLIST_SUB= MY_DBDIR=${MY_DBDIR} \ MY_SECDIR=${MY_SECDIR} \ MY_TMPDIR=${MY_TMPDIR} CONFLICTS_INSTALL= mariadb*-server-* \ mysql[0-9]*-server-* \ mysqlwsrep56*-server-* \ mysqlwsrep[1-489]*-server-* \ percona*-server-* USE_RC_SUBR= mysql-server SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= my_print_defaults.1 \ myisam_ftdump.1 \ myisamchk.1 \ myisamlog.1 \ myisampack.1 \ mysql.server.1 \ mysql_convert_table_format.1 \ mysql_fix_extensions.1 \ mysql_install_db.1 \ mysql_plugin.1 \ mysql_secure_installation.1 \ mysql_setpermission.1 \ mysql_tzinfo_to_sql.1 \ mysql_upgrade.1 \ mysql_zap.1 \ mysqlbug.1 \ mysqld_multi.1 \ mysqld_safe.1 \ mysqldumpslow.1 \ mysqlhotcopy.1 \ mysqlman.1 \ perror.1 \ replace.1 \ resolve_stack_dump.1 \ resolveip.1 OPTIONS_GROUP= STORAGE OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA OPTIONS_SUB= YES STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) ARCHIVE_DESC= Compile "Archive Storage" statically in server BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server EXAMPLE_DESC= Compile "Example Storage" statically in server FEDERATED_DESC= Compile "Federated Storage" statically in server INNOBASE_DESC= Compile "InnoDB Storage" statically in server PARTITION_DESC= Compile "Partitioning support Storage" statically in server PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 OPTIONS_GROUP+= FEATURES OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM PERFSCHM_SUB_LIST+= PERFSCHEMRC="" PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+=FEDER="" .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include .if ${SSL_DEFAULT} == base CMAKE_ARGS+= -DWITH_SSL=system .else 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 post-patch: ${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${MKDIR} ${STAGEDIR}${ETCDIR}/keyring ${MKDIR} ${STAGEDIR}${MY_SECDIR} ${MKDIR} ${STAGEDIR}${MY_TMPDIR} .if ${ARCH} == armv6 || ${ARCH} == armv7 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake .endif .include Index: head/databases/mysqlwsrep57-server/distinfo =================================================================== --- head/databases/mysqlwsrep57-server/distinfo (revision 516337) +++ head/databases/mysqlwsrep57-server/distinfo (revision 516338) @@ -1,7 +1,7 @@ -TIMESTAMP = 1567528044 +TIMESTAMP = 1571904382 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 2d4907d107fe6ea714a34da7b7e86c9cc7e53a445341ca2bb36e79f917266b16 -SIZE (codership-mysql-wsrep-wsrep_5.7.27-25.19_GH0.tar.gz) = 54689025 +SHA256 (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = ba03e5e35a1e972b3887935e1a13c93c30dfa44bb4d85b5f8dde2f9c982b3ff8 +SIZE (codership-mysql-wsrep-wsrep_5.7.28-25.20_GH0.tar.gz) = 54717971 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 Index: head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt (revision 516338) @@ -1,40 +1,40 @@ ---- CMakeLists.txt.orig 2019-08-30 12:42:21 UTC +--- CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ CMakeLists.txt -@@ -710,12 +710,10 @@ IF(UNIX) +@@ -730,12 +730,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) ADD_SUBDIRECTORY(libmysqld) - ADD_SUBDIRECTORY(libmysqld/examples) ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -724,8 +722,6 @@ ENDIF() +@@ -744,8 +742,6 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) -@@ -784,6 +780,7 @@ ENDIF() +@@ -804,6 +800,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -807,6 +804,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + INSTALL(FILES + README +@@ -825,6 +822,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) +ENDIF() ENDIF() INCLUDE(CPack) Index: head/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt (revision 516338) @@ -1,78 +1,75 @@ ---- client/CMakeLists.txt.orig 2019-07-17 18:38:36 UTC +--- client/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ client/CMakeLists.txt -@@ -31,8 +31,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) +@@ -38,17 +38,17 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) -## Subdirectory for mysqlpump code. -ADD_SUBDIRECTORY(dump) - ## We will need libeay32.dll and ssleay32.dll when running client executables. - COPY_OPENSSL_DLLS(copy_openssl_client) -@@ -40,11 +38,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -65,6 +65,7 @@ ADD_DEPENDENCIES(mysqltest GenError) +@@ -69,6 +69,7 @@ ADD_DEPENDENCIES(mysqltest GenError) ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) +@@ -81,10 +82,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) ADD_COMPILE_FLAGS( mysqlbinlog.cc -@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) +@@ -101,6 +104,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) - TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) + TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient) +ENDIF() MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) +@@ -116,9 +120,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) ENDIF() +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) +ENDIF() # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -123,11 +129,6 @@ ENDIF(WIN32) +@@ -127,11 +133,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( mysql_plugin - mysqlcheck - mysqldump - mysqlimport - mysqlshow - mysqlslap PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) Index: head/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake (revision 516338) @@ -1,12 +1,12 @@ ---- cmake/plugin.cmake.orig 2019-07-17 18:38:36 UTC +--- cmake/plugin.cmake.orig 2019-10-21 05:21:41 UTC +++ cmake/plugin.cmake -@@ -275,9 +275,6 @@ MACRO(MYSQL_ADD_PLUGIN) +@@ -282,9 +282,6 @@ MACRO(MYSQL_ADD_PLUGIN) MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT ${INSTALL_COMPONENT}) - INSTALL_DEBUG_TARGET(${target} - DESTINATION ${INSTALL_PLUGINDIR}/debug - COMPONENT ${INSTALL_COMPONENT}) # Add installed files to list for RPMs FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" Index: head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake (revision 516338) @@ -1,15 +1,15 @@ ---- cmake/ssl.cmake.orig 2019-07-17 18:38:36 UTC +--- cmake/ssl.cmake.orig 2019-10-21 05:21:41 UTC +++ cmake/ssl.cmake -@@ -180,6 +180,12 @@ MACRO (MYSQL_CHECK_SSL) +@@ -202,6 +202,12 @@ MACRO (MYSQL_CHECK_SSL) OPENSSL_MAJOR_VERSION STREQUAL "1" ) SET(OPENSSL_FOUND TRUE) + ELSEIF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND + OPENSSL_MAJOR_VERSION STREQUAL "2" + ) + SET(OPENSSL_FOUND TRUE) ELSE() SET(OPENSSL_FOUND FALSE) ENDIF() Index: head/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt (revision 516338) @@ -1,19 +1,19 @@ ---- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- include/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ include/CMakeLists.txt -@@ -69,14 +69,13 @@ SET(HEADERS +@@ -76,14 +76,13 @@ SET(HEADERS ${HEADERS_GEN_CONFIGURE} ) +IF(FALSE) INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR} - COMPONENT Development) -INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) -INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development PATTERN "*.h" PATTERN "psi_abi*" EXCLUDE ) +ENDIF() Index: head/databases/mysqlwsrep57-server/files/patch-include_my__compare.h =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-include_my__compare.h (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-include_my__compare.h (revision 516338) @@ -1,11 +1,11 @@ ---- include/my_compare.h.orig 2016-03-28 18:06:12 UTC +--- include/my_compare.h.orig 2019-10-21 05:21:41 UTC +++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { +@@ -47,7 +47,7 @@ extern "C" { But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. */ -#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ +#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ #define HA_MAX_KEY_SEG 16 /* Max segments for key */ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Index: head/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h (revision 516338) @@ -1,15 +1,15 @@ ---- include/my_thread_os_id.h.orig 2019-07-17 18:38:36 UTC +--- include/my_thread_os_id.h.orig 2019-10-21 05:21:41 UTC +++ include/my_thread_os_id.h -@@ -81,8 +81,12 @@ static inline my_thread_os_id_t my_thread_os_id() +@@ -88,8 +88,12 @@ static inline my_thread_os_id_t my_thread_os_id() return pthread_getthreadid_np(); #else #ifdef HAVE_INTEGER_PTHREAD_SELF +# ifdef __DragonFly__ + return syscall(SYS_lwp_gettid); +# else /* Unknown platform, fallback. */ return pthread_self(); +# endif #else /* Feature not available. */ return 0; Index: head/databases/mysqlwsrep57-server/files/patch-include_myisam.h =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-include_myisam.h (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-include_myisam.h (revision 516338) @@ -1,11 +1,11 @@ ---- include/myisam.h.orig 2016-03-28 18:06:12 UTC +--- include/myisam.h.orig 2019-10-21 05:21:41 UTC +++ include/myisam.h -@@ -45,7 +45,7 @@ extern "C" { +@@ -52,7 +52,7 @@ extern "C" { The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. */ -#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ +#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ #define MI_MAX_KEY_SEG 16 /* Max segments for key */ #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) Index: head/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt (revision 516338) @@ -1,35 +1,36 @@ ---- libmysql/CMakeLists.txt.orig 2019-03-22 10:07:57 UTC +--- libmysql/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ libmysql/CMakeLists.txt -@@ -231,11 +231,11 @@ IF(WIN32) +@@ -262,11 +262,11 @@ IF(WIN32) ENDIF() # LDAP authentication SASL client plugin -MESSAGE(STATUS "Creating LDAP authentication SASL client library.") -ADD_SUBDIRECTORY(authentication_ldap) +# MESSAGE(STATUS "Creating LDAP authentication SASL client library.") +# ADD_SUBDIRECTORY(authentication_ldap) # Merge several convenience libraries into one big mysqlclient --MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development) -+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development SKIP_INSTALL) +-MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development) ++MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL) + TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK}) # Visual Studio users need debug static library for debug projects - IF(MSVC) -@@ -284,7 +284,8 @@ IF(NOT DISABLE_SHARED) +@@ -312,8 +312,9 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. - MERGE_LIBRARIES_SHARED(libmysql ${LIBS} + MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries SKIP_INSTALL) -+ IF(FALSE) + TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK}) ++ IF (FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -328,6 +329,7 @@ IF(NOT DISABLE_SHARED) +@@ -357,6 +358,7 @@ IF(NOT DISABLE_SHARED) SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1) SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1) + ENDIF() ENDIF() ENDIF() Index: head/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt (revision 516338) @@ -1,9 +1,9 @@ ---- libservices/CMakeLists.txt.orig 2019-07-17 18:38:36 UTC +--- libservices/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ libservices/CMakeLists.txt -@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES +@@ -47,4 +47,6 @@ SET(MYSQLSERVICES_SOURCES mysql_keyring_service.c) ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) +IF(FALSE) INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() Index: head/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt (revision 516338) @@ -1,13 +1,13 @@ ---- man/CMakeLists.txt.orig 2019-07-17 18:38:36 UTC +--- man/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ man/CMakeLists.txt -@@ -14,9 +14,7 @@ +@@ -21,9 +21,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Copy man pages -FILE(GLOB MAN1_FILES *.1) -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) -FILE(GLOB MAN1_NDB ndb*.1) +FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1) FILE(GLOB MAN8_FILES *.8) FILE(GLOB MAN8_NDB ndb*.8) IF(MAN1_FILES) Index: head/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc (revision 516338) @@ -1,62 +1,62 @@ ---- mysys_ssl/my_default.cc.orig 2019-07-17 18:38:36 UTC +--- mysys_ssl/my_default.cc.orig 2019-10-21 05:21:41 UTC +++ mysys_ssl/my_default.cc -@@ -120,7 +120,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,}; +@@ -132,7 +132,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,}; #endif /* WITH_WREP */ /* Which directories are searched for options (and in which order) */ -#define MAX_DEFAULT_DIRS 6 +#define MAX_DEFAULT_DIRS 7 #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ static const char **default_directories = NULL; -@@ -936,6 +936,14 @@ static int search_default_file_with_ext(Process_option +@@ -948,6 +948,14 @@ static int search_default_file_with_ext(Process_option strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1); #endif /* WITH_WSREP */ + if (strstr(name, "/etc") == name) + { + fprintf(stderr, + "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", + name,name); + goto err; + } + while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file)) { line++; -@@ -1274,7 +1282,8 @@ void my_print_default_files(const char *conf_file) +@@ -1286,7 +1294,8 @@ void my_print_default_files(const char *conf_file) end[(strlen(end)-1)] = ' '; else strxmov(end, conf_file, *ext , " ", NullS); - fputs(name, stdout); + if (strstr(name, "/etc") != name) + fputs(name, stdout); } } } -@@ -1433,14 +1442,9 @@ static const char **init_default_directories(MEM_ROOT +@@ -1445,14 +1454,9 @@ static const char **init_default_directories(MEM_ROOT #else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); + errors += add_directory(alloc, "/usr/local/etc/", dirs); + errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); -#if defined(DEFAULT_SYSCONFDIR) - if (DEFAULT_SYSCONFDIR[0]) - errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); -#endif /* DEFAULT_SYSCONFDIR */ - #endif if ((env= getenv("MYSQL_HOME"))) -@@ -1510,7 +1514,7 @@ int check_file_permissions(const char *file_name, my_b +@@ -1522,7 +1526,7 @@ int check_file_permissions(const char *file_name, my_b MY_STAT stat_info; if (!my_stat(file_name,&stat_info,MYF(0))) - return 1; + return 0; /* Ignore .mylogin.cnf file if not exclusively readable/writable by current user. Index: head/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc (revision 516338) @@ -1,11 +1,11 @@ ---- plugin/password_validation/validate_password.cc.orig 2016-03-28 18:06:12 UTC +--- plugin/password_validation/validate_password.cc.orig 2019-10-21 05:21:41 UTC +++ plugin/password_validation/validate_password.cc -@@ -18,6 +18,8 @@ +@@ -25,6 +25,8 @@ #include #include #include +/* solve clash between libc++ bitset::test() and test macro from my_global.h */ +#undef test #include #include #include Index: head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake (revision 516338) @@ -1,15 +1,15 @@ ---- rapid/plugin/x/mysqlx_configure.cmake.orig 2019-07-17 18:38:36 UTC +--- rapid/plugin/x/mysqlx_configure.cmake.orig 2019-10-21 05:21:41 UTC +++ rapid/plugin/x/mysqlx_configure.cmake -@@ -35,6 +35,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_ername +@@ -42,6 +42,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_ername CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h ) +IF(FALSE) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Developement) -@@ -46,3 +47,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my +@@ -53,3 +54,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Developement) +ENDIF() Index: head/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (revision 516338) @@ -1,18 +1,18 @@ ---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2019-07-17 18:38:36 UTC +--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ rapid/unittest/gunit/xplugin/CMakeLists.txt -@@ -71,7 +71,6 @@ ADD_DEFINITIONS( +@@ -78,7 +78,6 @@ ADD_DEFINITIONS( ) INCLUDE_DIRECTORIES(SYSTEM - ${BOOST_INCLUDE_DIR} ${PROTOBUF_INCLUDE_DIRS} ${SSL_INCLUDE_DIRS} ${LIBEVENT_INCLUDE_DIRS} -@@ -81,6 +80,7 @@ INCLUDE_DIRECTORIES(SYSTEM +@@ -88,6 +87,7 @@ INCLUDE_DIRECTORIES(SYSTEM ) INCLUDE_DIRECTORIES( + ${BOOST_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/testing/include ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs Index: head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt (revision 516338) @@ -1,36 +1,36 @@ ---- scripts/CMakeLists.txt.orig 2019-08-30 12:42:21 UTC +--- scripts/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ scripts/CMakeLists.txt -@@ -326,6 +326,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -333,6 +333,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) + ELSEIF(lib STREQUAL "-pthread") + SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -411,14 +413,13 @@ ELSE() +@@ -418,14 +420,13 @@ ELSE() # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) + IF(WITH_SYSTEMD) SET(BIN_SCRIPTS - mysql_config mysqldumpslow ) ELSE() SET(BIN_SCRIPTS - mysql_config mysqldumpslow mysqld_multi mysqld_safe -@@ -462,7 +463,7 @@ ELSE() +@@ -469,7 +470,7 @@ ELSE() FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY) + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) Index: head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt (revision 516338) @@ -1,27 +1,27 @@ ---- sql/CMakeLists.txt.orig 2019-07-17 18:38:36 UTC +--- sql/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ sql/CMakeLists.txt -@@ -22,6 +22,8 @@ INCLUDE_DIRECTORIES( +@@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/regex ${SSL_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/sql + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR} ${WSREP_INCLUDES} ${LZ4_INCLUDE_DIR} ) -@@ -636,6 +638,7 @@ ADD_CUSTOM_TARGET( +@@ -647,6 +649,7 @@ ADD_CUSTOM_TARGET( ) +IF(FALSE) MYSQL_ADD_PLUGIN(udf_example udf_example.cc MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example") IF(NOT DISABLE_SHARED) -@@ -644,6 +647,7 @@ IF(NOT DISABLE_SHARED) +@@ -655,6 +658,7 @@ IF(NOT DISABLE_SHARED) PROPERTIES LINK_FLAGS "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def") ENDIF() +ENDIF() ENDIF() MYSQL_ADD_PLUGIN(locking_service locking_service_udf.cc Index: head/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc (revision 516338) @@ -1,32 +1,32 @@ ---- sql/conn_handler/socket_connection.cc.orig 2019-07-17 18:38:36 UTC +--- sql/conn_handler/socket_connection.cc.orig 2019-10-21 05:21:41 UTC +++ sql/conn_handler/socket_connection.cc -@@ -946,22 +946,25 @@ Channel_info* Mysqld_socket_listener::listen_for_conne +@@ -953,22 +953,25 @@ Channel_info* Mysqld_socket_listener::listen_for_conne signal(SIGCHLD, SIG_DFL); request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE, mysql_socket_getfd(connect_sock), NULL); - fromhost(&req); + void (*my_fromhost) (void *) = (void (*)(void *)) fromhost; + my_fromhost(&req); - if (!hosts_access(&req)) + int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access; + if (!my_hosts_access(&req)) { /* This may be stupid but refuse() includes an exit(0) which we surely don't want... clean_exit() - same stupid thing ... */ + char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client; syslog(LOG_AUTH | m_deny_severity, - "refused connect from %s", eval_client(&req)); + "refused connect from %s", my_eval_client(&req)); #ifdef HAVE_LIBWRAP_PROTOTYPES // Some distros have patched tcpd.h to have proper prototypes if (req.sink) - (req.sink)(req.fd); + ((void (*)(int)) (req.sink))(req.fd); #else // Some distros have not patched tcpd.h if (req.sink) Index: head/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc (revision 516338) @@ -1,38 +1,38 @@ ---- sql/sys_vars.cc.orig 2019-07-17 18:38:36 UTC +--- sql/sys_vars.cc.orig 2019-10-21 05:21:41 UTC +++ sql/sys_vars.cc -@@ -1741,7 +1741,7 @@ static Sys_var_ulong Sys_interactive_timeout( +@@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_timeout( "connection before closing it", SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); static Sys_var_ulong Sys_join_buffer_size( "join_buffer_size", -@@ -2621,7 +2621,7 @@ static Sys_var_ulong Sys_net_read_timeout( +@@ -2628,7 +2628,7 @@ static Sys_var_ulong Sys_net_read_timeout( "Number of seconds to wait for more data from a connection before " "aborting the read", SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_read_timeout)); -@@ -2645,7 +2645,7 @@ static Sys_var_ulong Sys_net_write_timeout( +@@ -2652,7 +2652,7 @@ static Sys_var_ulong Sys_net_write_timeout( "Number of seconds to wait for a block to be written to a connection " "before aborting the write", SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -4369,7 +4369,7 @@ static Sys_var_ulong Sys_net_wait_timeout( +@@ -4372,7 +4372,7 @@ static Sys_var_ulong Sys_net_wait_timeout( "The number of seconds the server waits for activity on a " "connection before closing it", SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); static Sys_var_plugin Sys_default_storage_engine( Index: head/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h (revision 516338) @@ -1,13 +1,13 @@ ---- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC +--- storage/innobase/include/srv0mon.h.orig 2019-10-21 05:21:41 UTC +++ storage/innobase/include/srv0mon.h -@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang +@@ -41,6 +41,10 @@ Created 12/15/2009 Jimmy Yang /* Required for FreeBSD so that INT64_MAX is defined. */ #define __STDC_LIMIT_MACROS #endif /* __STDC_LIMIT_MACROS */ +#ifdef __DragonFly__ +/* The hack above doen't work for dragonfly, stdint.h already imported */ +#include +#endif #include Index: head/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c (revision 516338) @@ -1,23 +1,23 @@ ---- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC +--- storage/myisam/mi_dynrec.c.orig 2019-10-21 05:21:41 UTC +++ storage/myisam/mi_dynrec.c -@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my +@@ -72,18 +72,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my_off_t size) DBUG_RETURN(1); } /* - I wonder if it is good to use MAP_NORESERVE. From the Linux man page: - MAP_NORESERVE - Do not reserve swap space for this mapping. When swap space is - reserved, one has the guarantee that it is possible to modify the - mapping. When swap space is not reserved one might get SIGSEGV - upon a write if no physical memory is available. + MAP_NORESERVE is unimplemented in FreeBSD */ info->s->file_map= (uchar*) my_mmap(0, (size_t) size, info->s->mode==O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE, - MAP_SHARED | MAP_NORESERVE, + MAP_SHARED, info->dfile, 0L); if (info->s->file_map == (uchar*) MAP_FAILED) { Index: head/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt (revision 516337) +++ head/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt (revision 516338) @@ -1,12 +1,12 @@ ---- support-files/CMakeLists.txt.orig 2019-07-17 18:38:36 UTC +--- support-files/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC +++ support-files/CMakeLists.txt -@@ -60,7 +60,9 @@ IF(UNIX) +@@ -67,7 +67,9 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() +IF(FALSE) INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +ENDIF() SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(sbindir ${prefix}/${INSTALL_SBINDIR})