Index: head/databases/mysqlwsrep57-server/Makefile =================================================================== --- head/databases/mysqlwsrep57-server/Makefile (revision 554441) +++ head/databases/mysqlwsrep57-server/Makefile (revision 554442) @@ -1,201 +1,208 @@ # Created by: Vasil Dimov # $FreeBSD$ PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.30 +PORTVERSION?= 5.7.31 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.22 +DISTVERSIONSUFFIX?= -25.23 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 \ 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 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_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_CXXSTD= c++11 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 LDFLAGS+= -L${LOCALBASE}/lib . if ${CHOSEN_COMPILER_TYPE} == clang CXXFLAGS+= -Wno-c++11-narrowing . endif +.endif + +# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker +# error with llmv11. +.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109 +CFLAGS+= -fcommon .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} .include Index: head/databases/mysqlwsrep57-server/distinfo =================================================================== --- head/databases/mysqlwsrep57-server/distinfo (revision 554441) +++ head/databases/mysqlwsrep57-server/distinfo (revision 554442) @@ -1,7 +1,7 @@ -TIMESTAMP = 1591201597 +TIMESTAMP = 1603213079 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 2fb00a0b6f644b1f37bdc2cdbee5f090fbc0377e66b06dbe1971943097a35658 -SIZE (codership-mysql-wsrep-wsrep_5.7.30-25.22_GH0.tar.gz) = 54733023 +SHA256 (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 1a66f94778a37ce909e92e35eb3e5adb961708f105fe67281062185b93ab1945 +SIZE (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 54754887 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 554441) +++ head/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt (revision 554442) @@ -1,40 +1,40 @@ ---- CMakeLists.txt.orig 2020-05-27 10:17:47 UTC +--- CMakeLists.txt.orig 2020-10-07 08:29:27 UTC +++ CMakeLists.txt -@@ -738,12 +738,10 @@ IF(UNIX) +@@ -739,12 +739,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() -@@ -752,8 +750,6 @@ ENDIF() +@@ -753,8 +751,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) -@@ -812,6 +808,7 @@ ENDIF() +@@ -813,6 +809,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES README -@@ -833,6 +830,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -834,6 +831,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-cmake_os_FreeBSD.cmake =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake (revision 554441) +++ head/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake (revision 554442) @@ -1,31 +1,31 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC +--- cmake/os/FreeBSD.cmake.orig 2020-10-07 08:29:27 UTC +++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) +@@ -45,6 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) IF(NOT HAVE_SUPPORTED_CLANG_VERSION) MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!") ENDIF() + CHECK_C_SOURCE_RUNS(" + int main() + { + return (__clang_major__ >= 4); + }" I386_ATOMIC_BUILTINS) + IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS)) + SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") + ENDIF() + ELSEIF(CMAKE_COMPILER_IS_GNUCC) + EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion + OUTPUT_VARIABLE GCC_VERSION) + IF(GCC_VERSION VERSION_LESS 4.4) + MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!") + ENDIF() ELSE() MESSAGE(FATAL_ERROR "Unsupported compiler!") ENDIF() -@@ -38,4 +52,6 @@ ENDIF() +@@ -53,4 +67,6 @@ ENDIF() # Should not be needed any more, but kept for easy resurrection if needed # #Legacy option, maybe not needed anymore , taken as is from autotools build # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000) - +# For GCC maybe it's also good idea to use +# ADD_DEFINITIONS(-D_GNU_SOURCE) + Index: head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working (nonexistent) +++ head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working (revision 554442) @@ -0,0 +1,20 @@ +--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig 2020-11-02 12:09:01 UTC ++++ rapid/plugin/group_replication/src/recovery_state_transfer.cc +@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre + donor_connection_interface.initialize_channel(const_cast(""), + 0, + NULL, NULL, ++ false, + NULL, + NULL, + NULL, +@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre + NULL, + NULL, + NULL, +- NULL, +- NULL, ++ false, + DEFAULT_THREAD_PRIORITY, + 1, false); + Property changes on: head/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt (revision 554441) +++ head/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt (revision 554442) @@ -1,36 +1,36 @@ ---- scripts/CMakeLists.txt.orig 2020-05-27 10:17:47 UTC +--- scripts/CMakeLists.txt.orig 2020-10-07 08:29:27 UTC +++ scripts/CMakeLists.txt -@@ -336,6 +336,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) +@@ -330,6 +330,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() -@@ -421,14 +423,13 @@ ELSE() +@@ -415,14 +417,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 -@@ -472,7 +473,7 @@ ELSE() +@@ -466,7 +467,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_binlog.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc (nonexistent) +++ head/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc (revision 554442) @@ -0,0 +1,24 @@ +--- sql/binlog.cc.orig 2020-11-02 12:26:34 UTC ++++ sql/binlog.cc +@@ -10144,8 +10144,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const + + char* missing_gtids= NULL; + char* slave_executed_gtids= NULL; +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids, false); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false); + + /* + Log the information about the missing purged GTIDs to the error log +@@ -10216,8 +10216,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se + Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map()); + gtid_missing.add_gtid_set(slave_executed_gtid_set); + gtid_missing.remove_gtid_set(previous_gtid_set); +- gtid_missing.to_string(&missing_gtids, NULL); +- slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL); ++ gtid_missing.to_string(&missing_gtids, false); ++ slave_executed_gtid_set->to_string(&slave_executed_gtids, false); + + String tmp_uuid; + uchar name[]= "slave_uuid"; Property changes on: head/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc (revision 554441) +++ head/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc (revision 554442) @@ -1,38 +1,38 @@ ---- sql/sys_vars.cc.orig 2019-10-21 05:21:41 UTC +--- sql/sys_vars.cc.orig 2020-10-07 08:29:27 UTC +++ sql/sys_vars.cc @@ -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", @@ -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)); @@ -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)); -@@ -4372,7 +4372,7 @@ static Sys_var_ulong Sys_net_wait_timeout( +@@ -4378,7 +4378,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_fsp_fsp0fsp.cc =================================================================== --- head/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc (nonexistent) +++ head/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc (revision 554442) @@ -0,0 +1,11 @@ +--- storage/innobase/fsp/fsp0fsp.cc.orig 2020-11-02 10:59:53 UTC ++++ storage/innobase/fsp/fsp0fsp.cc +@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info( + + if (elen == MY_AES_BAD_DATA) { + my_free(master_key); +- return(NULL); ++ return(false); + } + + /* Check checksum bytes. */ Property changes on: head/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property