diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 9e64d482087e..70f20347216a 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -1,210 +1,215 @@ # Created by: Vasil Dimov PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.33 +PORTVERSION?= 5.7.34 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.25 -PORTREVISION?= 1 +DISTVERSIONSUFFIX?= -25.26 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 FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+=FEDER="" .include .if ${PORT_OPTIONS:MPERFSCHM} SUB_LIST+= PERFSCHEMRC="" .else SUB_LIST+= PERFSCHEMRC="--skip-performance-schema" .endif .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 +# Ensure that assertions are not turned on in non-debug builds. +.if !defined(WITH_DEBUG) +CFLAGS+= -DNDEBUG +CXXFLAGS+= -DNDEBUG +.endif + # Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker # error with llmv11. .if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109) || ${CHOSEN_COMPILER_TYPE} == gcc 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 diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo index 17189e6e9b0c..4c464f3fbaef 100644 --- a/databases/mysqlwsrep57-server/distinfo +++ b/databases/mysqlwsrep57-server/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1617281067 +TIMESTAMP = 1627385828 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.33-25.25_GH0.tar.gz) = 0a32cace737ba300f17562bf0b001e5e3bbc33808517636b108e38dfe4289ab6 -SIZE (codership-mysql-wsrep-wsrep_5.7.33-25.25_GH0.tar.gz) = 56532487 +SHA256 (codership-mysql-wsrep-wsrep_5.7.34-25.26_GH0.tar.gz) = da075a5b77104318bdd0b480e2e46b491b2410b2420c93985870c682d14ea0ef +SIZE (codership-mysql-wsrep-wsrep_5.7.34-25.26_GH0.tar.gz) = 56513288 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 diff --git a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt index cf1fa3717703..6752c25fcd24 100644 --- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt @@ -1,40 +1,40 @@ ---- CMakeLists.txt.orig 2020-10-07 08:29:27 UTC +--- CMakeLists.txt.orig 2021-06-16 10:56:53 UTC +++ CMakeLists.txt -@@ -739,12 +739,10 @@ IF(UNIX) +@@ -712,12 +712,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() -@@ -753,8 +751,6 @@ ENDIF() +@@ -726,8 +724,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) -@@ -813,6 +809,7 @@ ENDIF() +@@ -786,6 +782,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES README -@@ -834,6 +831,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -807,6 +804,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "mysql.info" EXCLUDE PATTERN "sp-imp-spec.txt" EXCLUDE ) +ENDIF() ENDIF() INCLUDE(CPack) diff --git a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc index 42c307d44bf7..bc88fe7a0b30 100644 --- a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc +++ b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc @@ -1,62 +1,62 @@ ---- mysys_ssl/my_default.cc.orig 2019-10-21 05:21:41 UTC +--- mysys_ssl/my_default.cc.orig 2021-06-16 10:56:53 UTC +++ mysys_ssl/my_default.cc @@ -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; @@ -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++; -@@ -1286,7 +1294,8 @@ void my_print_default_files(const char *conf_file) +@@ -1290,7 +1298,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); } } } -@@ -1445,14 +1454,9 @@ static const char **init_default_directories(MEM_ROOT +@@ -1449,14 +1458,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"))) -@@ -1522,7 +1526,7 @@ int check_file_permissions(const char *file_name, my_b +@@ -1526,7 +1530,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. diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc index 267f774c1d8d..fd5f2169b959 100644 --- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc +++ b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc @@ -1,20 +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.orig 2021-06-16 10:56:53 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); + 1, false, true, true); diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt index d76154ec725f..2c76de951e7e 100644 --- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt @@ -1,36 +1,36 @@ ---- scripts/CMakeLists.txt.orig 2020-10-07 08:29:27 UTC +--- scripts/CMakeLists.txt.orig 2021-06-16 10:56:53 UTC +++ scripts/CMakeLists.txt @@ -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() -@@ -415,14 +417,13 @@ ELSE() +@@ -422,14 +424,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 -@@ -466,7 +467,7 @@ ELSE() +@@ -473,7 +474,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) diff --git a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt index 72d6df2bab00..e3b27523cfbe 100644 --- a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt +++ b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt @@ -1,27 +1,27 @@ ---- sql/CMakeLists.txt.orig 2020-05-27 10:17:47 UTC +--- sql/CMakeLists.txt.orig 2021-06-16 10:56:53 UTC +++ sql/CMakeLists.txt @@ -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} ) -@@ -661,6 +663,7 @@ ADD_CUSTOM_TARGET( +@@ -663,6 +665,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) -@@ -669,6 +672,7 @@ IF(NOT DISABLE_SHARED) +@@ -671,6 +674,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 diff --git a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc index 270179e31aa4..5d99dc0814c2 100644 --- a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc +++ b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc @@ -1,24 +1,24 @@ ---- sql/binlog.cc.orig 2020-11-02 12:26:34 UTC +--- sql/binlog.cc.orig 2021-06-16 10:56:53 UTC +++ sql/binlog.cc -@@ -10144,8 +10144,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const +@@ -10149,8 +10149,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 +@@ -10221,8 +10221,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"; diff --git a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc index 44325de6c602..e33c2943509a 100644 --- a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc +++ b/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc @@ -1,11 +1,11 @@ ---- sql/locks/shared_spin_lock.cc.orig 2020-12-10 03:01:55 UTC +--- sql/locks/shared_spin_lock.cc.orig 2021-06-22 10:50:24 UTC +++ sql/locks/shared_spin_lock.cc @@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or { this->spin_exclusive_lock(); } -- my_atomic_store64(&this->m_exclusive_owner, self); -+ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast(self)); - return (*this); - } - +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast(self)); + #else + my_atomic_store64(&this->m_exclusive_owner, self); diff --git a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc index 0400ac649435..52c636089b2d 100644 --- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc +++ b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc @@ -1,38 +1,38 @@ ---- sql/sys_vars.cc.orig 2020-10-07 08:29:27 UTC +--- sql/sys_vars.cc.orig 2021-06-16 10:56:53 UTC +++ sql/sys_vars.cc -@@ -1748,7 +1748,7 @@ static Sys_var_ulong Sys_interactive_timeout( +@@ -1749,7 +1749,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( +@@ -2629,7 +2629,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( +@@ -2653,7 +2653,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)); -@@ -4378,7 +4378,7 @@ static Sys_var_ulong Sys_net_wait_timeout( +@@ -4389,7 +4389,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(