7 files changed, 87 insertions, 10 deletions

diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 1af690f7166a..0b35f4507a2c 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mahdi Mokhtari <mokhi64@gmail.com>
 
 PORTNAME?=	mysql
-PORTVERSION=	5.7.33
+PORTVERSION=	5.7.34
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/MySQL-5.7
@@ -32,6 +32,8 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 
 CMAKE_BUILD_TYPE=	Release
 
+CXXFLAGS+=	-DNDEBUG
+
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
index 8821daa19afd..1eab4b5543c1 100644
--- a/databases/mysql57-server/distinfo
+++ b/databases/mysql57-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612332815
-SHA256 (mysql-boost-5.7.33.tar.gz) = cfcaf6f37a055d808fe1472eb0359864e2227aa0206c55c4e1961bab2ecc304b
-SIZE (mysql-boost-5.7.33.tar.gz) = 52912380
+TIMESTAMP = 1621509617
+SHA256 (mysql-boost-5.7.34.tar.gz) = 5bc2c7c0bb944b5bb219480dde3c1caeb049e7351b5bba94c3b00ac207929c7b
+SIZE (mysql-boost-5.7.34.tar.gz) = 52891142
diff --git a/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake
new file mode 100644
index 000000000000..f8c13ec7c398
--- /dev/null
+++ b/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake
@@ -0,0 +1,20 @@
+--- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
++++ cmake/build_configurations/compiler_options.cmake
+@@ -43,7 +43,7 @@ IF(UNIX)  
+ 
+   # Default GCC flags
+   IF(CMAKE_COMPILER_IS_GNUCC)
+-    SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
++    SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
+     # Disable inline optimizations for valgrind testing to avoid false positives
+     IF(WITH_VALGRIND)
+       STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
+@@ -68,7 +68,7 @@ IF(UNIX)  
+     ENDIF()
+   ENDIF()
+   IF(CMAKE_COMPILER_IS_GNUCXX)
+-    SET(COMMON_CXX_FLAGS               "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
++    SET(COMMON_CXX_FLAGS               "-fno-omit-frame-pointer -fno-strict-aliasing")
+     # GCC 6 has C++14 as default, set it explicitly to the old default.
+     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
+                     OUTPUT_VARIABLE GXX_VERSION)
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc b/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc
new file mode 100644
index 000000000000..42d191ec2da4
--- /dev/null
+++ b/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc
@@ -0,0 +1,20 @@
+--- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig	2021-03-26 06:58:52 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>"),
+                                                   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, true, true);
+ 
diff --git a/databases/mysql57-server/files/patch-sql_binlog.cc b/databases/mysql57-server/files/patch-sql_binlog.cc
new file mode 100644
index 000000000000..7367bc283603
--- /dev/null
+++ b/databases/mysql57-server/files/patch-sql_binlog.cc
@@ -0,0 +1,24 @@
+--- sql/binlog.cc.orig	2021-03-26 06:58:52 UTC
++++ sql/binlog.cc
+@@ -9973,8 +9973,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
+@@ -10045,8 +10045,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/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc
index 44325de6c602..ca63b9f31439 100644
--- a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc
+++ b/databases/mysql57-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-05-20 11:22:55 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();
-   }
+@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or
+ #if defined(__APPLE__)
+   my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
+ #else
 -  my_atomic_store64(&this->m_exclusive_owner, self);
 +  my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
+ #endif
    return (*this);
  }
- 
diff --git a/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc
new file mode 100644
index 000000000000..8d2627e75010
--- /dev/null
+++ b/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc
@@ -0,0 +1,11 @@
+--- storage/innobase/fsp/fsp0fsp.cc.orig	2021-03-26 06:58:52 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. */