diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
index 9e64d482087e8..70f20347216aa 100644
--- a/databases/mysqlwsrep57-server/Makefile
+++ b/databases/mysqlwsrep57-server/Makefile
@@ -1,10 +1,9 @@
 # Created by: Vasil Dimov <vd@FreeBSD.org>
 
 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
@@ -188,6 +187,12 @@ 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
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
index 17189e6e9b0c6..4c464f3fbaef3 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 cf1fa37177036..6752c25fcd243 100644
--- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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)
@@ -13,7 +13,7 @@
    ENDIF(WITH_EMBEDDED_SERVER)
  ENDIF()
  
-@@ -753,8 +751,6 @@ ENDIF()
+@@ -726,8 +724,6 @@ ENDIF()
  ADD_SUBDIRECTORY(scripts)
  
  IF(NOT WITHOUT_SERVER)
@@ -22,7 +22,7 @@
    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
  #
@@ -30,7 +30,7 @@
  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
    )
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 42c307d44bf71..bc88fe7a0b306 100644
--- a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
+++ b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
@@ -1,4 +1,4 @@
---- 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 */
@@ -24,7 +24,7 @@
    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);
@@ -34,7 +34,7 @@
          }
        }
      }
-@@ -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
  
@@ -51,7 +51,7 @@
  #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)))
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 267f774c1d8d9..fd5f2169b9595 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,4 +1,4 @@
---- 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<char*>("<NULL>"),
@@ -16,5 +16,5 @@
 -                                                  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 d76154ec725f4..2c76de951e7ef 100644
--- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
@@ -1,4 +1,4 @@
---- 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)
@@ -9,7 +9,7 @@
          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)
  
@@ -25,7 +25,7 @@
        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
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
index 72d6df2bab00a..e3b27523cfbee 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
@@ -1,4 +1,4 @@
---- 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 
@@ -9,7 +9,7 @@
    ${WSREP_INCLUDES}
    ${LZ4_INCLUDE_DIR}
  )
-@@ -661,6 +663,7 @@ ADD_CUSTOM_TARGET( 
+@@ -663,6 +665,7 @@ ADD_CUSTOM_TARGET( 
  )
  
  
@@ -17,7 +17,7 @@
  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()
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc
index 270179e31aa4e..5d99dc0814c2f 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc
+++ b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc
@@ -1,6 +1,6 @@
---- 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;
@@ -11,7 +11,7 @@
  
    /*
       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);
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 44325de6c6023..e33c2943509a3 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<int64>(self));
-   return (*this);
- }
- 
+-#if defined(__APPLE__)
++#if defined(__APPLE__) || defined(__FreeBSD__)
+   my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(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 0400ac6494350..52c636089b2dc 100644
--- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
+++ b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
@@ -1,6 +1,6 @@
---- 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),
@@ -9,7 +9,7 @@
  
  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),
@@ -18,7 +18,7 @@
         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),
@@ -27,7 +27,7 @@
         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),