diff --git a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake
index 713c197992bc..2c0937746b2a 100644
--- a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake
+++ b/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake
@@ -1,20 +1,20 @@
 --- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
 +++ cmake/build_configurations/compiler_options.cmake
-@@ -29,7 +29,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
+@@ -50,7 +50,7 @@ IF(UNIX)  
    IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
+-      SET(COMMON_C_FLAGS             "-fabi-version=2 ${COMMON_C_FLAGS}")
++      SET(COMMON_C_FLAGS             "${COMMON_C_FLAGS}")
+     ENDIF()
      # Disable inline optimizations for valgrind testing to avoid false positives
      IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-@@ -42,7 +42,7 @@ IF(UNIX)  
-     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-   ENDIF()
+@@ -77,7 +77,7 @@ IF(UNIX)  
    IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
+-      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
++      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS}")
+     ENDIF()
      # 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/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake
index 713c197992bc..2c0937746b2a 100644
--- a/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake
+++ b/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake
@@ -1,20 +1,20 @@
 --- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
 +++ cmake/build_configurations/compiler_options.cmake
-@@ -29,7 +29,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
+@@ -50,7 +50,7 @@ IF(UNIX)  
    IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
+-      SET(COMMON_C_FLAGS             "-fabi-version=2 ${COMMON_C_FLAGS}")
++      SET(COMMON_C_FLAGS             "${COMMON_C_FLAGS}")
+     ENDIF()
      # Disable inline optimizations for valgrind testing to avoid false positives
      IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-@@ -42,7 +42,7 @@ IF(UNIX)  
-     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-   ENDIF()
+@@ -77,7 +77,7 @@ IF(UNIX)  
    IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
+-      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
++      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS}")
+     ENDIF()
      # 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/percona57-server/Makefile b/databases/percona57-server/Makefile
index 805366e9900e..3c4b7faeabee 100644
--- a/databases/percona57-server/Makefile
+++ b/databases/percona57-server/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	percona
-DISTVERSION=	5.7.30-33
+DISTVERSION=	5.7.31-34
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
diff --git a/databases/percona57-server/distinfo b/databases/percona57-server/distinfo
index 86c3a02e8bd9..f952429e98c1 100644
--- a/databases/percona57-server/distinfo
+++ b/databases/percona57-server/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1590380978
-SHA256 (percona-server-5.7.30-33.tar.gz) = 93c7d82a95549696aedc41a4d74d888eae86c042f27bdc72f9a1f92fc76ecae0
-SIZE (percona-server-5.7.30-33.tar.gz) = 85909418
+TIMESTAMP = 1599042632
+SHA256 (percona-server-5.7.31-34.tar.gz) = 60afa347e142077d96ce7f8e8d9c635a3b01b59d2a7487713817be3de5086000
+SIZE (percona-server-5.7.31-34.tar.gz) = 86189514
 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
 SIZE (boost_1_59_0.tar.gz) = 83709983
diff --git a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake
index 713c197992bc..2c0937746b2a 100644
--- a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake
+++ b/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake
@@ -1,20 +1,20 @@
 --- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
 +++ cmake/build_configurations/compiler_options.cmake
-@@ -29,7 +29,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
+@@ -50,7 +50,7 @@ IF(UNIX)  
    IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
+-      SET(COMMON_C_FLAGS             "-fabi-version=2 ${COMMON_C_FLAGS}")
++      SET(COMMON_C_FLAGS             "${COMMON_C_FLAGS}")
+     ENDIF()
      # Disable inline optimizations for valgrind testing to avoid false positives
      IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-@@ -42,7 +42,7 @@ IF(UNIX)  
-     SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
-   ENDIF()
+@@ -77,7 +77,7 @@ IF(UNIX)  
    IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
+-      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
++      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS}")
+     ENDIF()
      # 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/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt b/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt
index 83311674583d..10a074b9cf92 100644
--- a/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt
+++ b/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt
@@ -11,16 +11,13 @@
    RETURN ()
  ENDIF ()
  
-@@ -111,50 +111,11 @@ EXECUTE_PROCESS(
+@@ -123,38 +123,6 @@ EXECUTE_PROCESS(
  # split the list into lines
  STRING(REGEX MATCHALL "[^\n]+" ROCKSDB_LIB_SOURCES ${SCRIPT_OUTPUT})
  
 -# add bundled compression code
 -SET(ROCKSDB_LIB_SOURCES
 -  ${ROCKSDB_LIB_SOURCES}
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4hc.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib/lz4frame.c
 -  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c
 -  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c
 -  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c
@@ -53,21 +50,11 @@
  INCLUDE_DIRECTORIES(
    ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb
    ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include
-   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include/rocksdb
-   ${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/third-party/gtest-1.8.1/fused-src
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lz4/lib
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder
+@@ -198,6 +166,7 @@ SET(ROCKSDB_SOURCES
  )
  
- ADD_DEFINITIONS(-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX -DZLIB -DLZ4
-@@ -188,7 +149,7 @@ SET(ROCKSDB_SOURCES
-   ${ROCKSDB_LIB_SOURCES}
- )
- 
--SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt" "-ldl")
-+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} "-lrt" "-ldl -llz4 -lzstd")
+ SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl")
++SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl -llz4 -lzstd")
  
  MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
    LINK_LIBRARIES ${rocksdb_static_libs}