Index: Makefile
===================================================================
--- Makefile	(revision 521884)
+++ Makefile	(working copy)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=		mysql
-PORTVERSION=		8.0.17
-PORTREVISION?=		2
+PORTVERSION=		8.0.18
+PORTREVISION?=		0
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
@@ -29,6 +29,7 @@
 LIB_DEPENDS+=	libevent.so:devel/libevent \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
+		libzstd.so:archivers/zstd \
 		libre2.so:devel/re2 \
 		libprotobuf.so:devel/protobuf \
 		libunwind.so:devel/libunwind
Index: distinfo
===================================================================
--- distinfo	(revision 521884)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565048626
-SHA256 (mysql-boost-8.0.17.tar.gz) = d44231316ce30a1d1189125ceed86d3388409778e17d0e3b9a060f532463e29a
-SIZE (mysql-boost-8.0.17.tar.gz) = 189322239
+TIMESTAMP = 1578004259
+SHA256 (mysql-boost-8.0.18.tar.gz) = 0eccd9d79c04ba0ca661136bb29085e3833d9c48ed022d0b9aba12236994186b
+SIZE (mysql-boost-8.0.18.tar.gz) = 194953221
Index: files/patch-client_CMakeLists.txt
===================================================================
--- files/patch-client_CMakeLists.txt	(revision 521884)
+++ files/patch-client_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
-+++ client/CMakeLists.txt
-@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+--- client/CMakeLists.txt.orig	2020-01-06 12:28:30.790492000 +0100
++++ client/CMakeLists.txt	2020-01-06 12:30:39.138064000 +0100
+@@ -22,9 +22,8 @@
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
@@ -8,45 +8,52 @@
 -ADD_SUBDIRECTORY(dump)
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
+ MYSQL_ADD_EXECUTABLE(mysql
+   ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
+   completion_hash.cc
+@@ -33,6 +32,7 @@ MYSQL_ADD_EXECUTABLE(mysql
+   readline.cc
+   LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
+   )
 +ENDIF()
  
  IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
-@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
+   MYSQL_ADD_EXECUTABLE(mysql_upgrade
+@@ -48,6 +48,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UPPER STREQUAL "
+     )
+ ENDIF()
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
- 
-@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ MYSQL_ADD_EXECUTABLE(mysqltest
+   mysqltest.cc
+   mysqltest/error_names.cc
+@@ -80,6 +81,9 @@ MYSQL_ADD_EXECUTABLE(mysqlshow
+   mysqlshow.cc
+   LINK_LIBRARIES mysqlclient
+   )
 +ENDIF()
- 
++
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- SET(MYSQLBINLOG_LIB_SOURCES
-   ${CMAKE_SOURCE_DIR}/strings/decimal.cc
-@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog
+   mysqlbinlog.cc
+   ${CMAKE_SOURCE_DIR}/sql/json_binary.cc
+@@ -101,10 +105,12 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog
+   DEPENDENCIES GenError
+   LINK_LIBRARIES mysqlclient client_base binlogevents_static
+   )
 +ENDIF()
  
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
+ TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
+ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
  
 +IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys)
+ MYSQL_ADD_EXECUTABLE(mysqladmin
+   mysqladmin.cc
+   LINK_LIBRARIES mysqlclient
+@@ -127,6 +133,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
+   path.cc
+   LINK_LIBRARIES mysys
+   )
 +ENDIF()
  
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
Index: files/patch-cmake_plugin.cmake
===================================================================
--- files/patch-cmake_plugin.cmake	(revision 521884)
+++ files/patch-cmake_plugin.cmake	(working copy)
@@ -1,6 +1,6 @@
---- cmake/plugin.cmake.orig	2017-06-27 11:44:29 UTC
-+++ cmake/plugin.cmake
-@@ -207,9 +207,6 @@ MACRO(MYSQL_ADD_PLUGIN)
+--- cmake/plugin.cmake.orig	2019-09-20 10:30:51.000000000 +0200
++++ cmake/plugin.cmake	2020-01-05 12:20:34.158131000 +0100
+@@ -226,9 +226,6 @@
        MYSQL_INSTALL_TARGETS(${target}
          DESTINATION ${INSTALL_PLUGINDIR}
          COMPONENT ${INSTALL_COMPONENT})
@@ -7,6 +7,6 @@
 -      INSTALL_DEBUG_TARGET(${target}
 -        DESTINATION ${INSTALL_PLUGINDIR}/debug
 -        COMPONENT ${INSTALL_COMPONENT})
-       # For internal testing in PB2, append collections files
-       IF(DEFINED ENV{PB2WORKDIR})
-         PLUGIN_APPEND_COLLECTIONS(${plugin})
+     ENDIF()
+   ELSE()
+     IF(WITHOUT_${plugin})
Index: files/patch-libmysql_CMakeLists.txt
===================================================================
--- files/patch-libmysql_CMakeLists.txt	(revision 521884)
+++ files/patch-libmysql_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig	2018-12-20 20:14:03 UTC
-+++ libmysql/CMakeLists.txt
-@@ -239,7 +239,7 @@ MESSAGE(STATUS "Creating LDAP authentica
+--- libmysql/CMakeLists.txt.orig	2019-09-20 10:30:51.000000000 +0200
++++ libmysql/CMakeLists.txt	2020-01-05 12:23:36.342212000 +0100
+@@ -245,7 +245,7 @@
  ADD_SUBDIRECTORY(authentication_ldap)
    
  # Merge several convenience libraries into one big mysqlclient
@@ -9,19 +9,19 @@
  TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
-@@ -280,9 +280,10 @@ IF(NOT DISABLE_SHARED)
-   # and link them together into shared library.
-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} ${CLIENT_API_NONBLOCKING_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries SKIP_INSTALL)
-   TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
+@@ -286,9 +286,10 @@
+   ${CLIENT_API_FUNCTIONS}
+   ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+   ${CLIENT_API_NONBLOCKING_FUNCTIONS}
+-  COMPONENT SharedLibraries)
++  COMPONENT SharedLibraries SKIP_INSTALL)
+ TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
  
 +IF(FALSE)
-   IF(WIN32)
-     # So that libmysql_api_test below can find the .dll
-     ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
-@@ -338,6 +339,7 @@ ENDIF()
+ IF(WIN32)
+   # So that libmysql_api_test below can find the .dll
+   ADD_CUSTOM_COMMAND(TARGET libmysql POST_BUILD
+@@ -344,6 +345,7 @@
  # to initialize api_calls[] array in api_test.c
  #
  SET(CLIENT_API_FUNCTION_LIST "")
Index: files/patch-man_CMakeLists.txt
===================================================================
--- files/patch-man_CMakeLists.txt	(revision 521884)
+++ files/patch-man_CMakeLists.txt	(working copy)
@@ -1,14 +1,40 @@
---- man/CMakeLists.txt.orig	2019-06-25 10:23:30 UTC
-+++ man/CMakeLists.txt
-@@ -21,9 +21,8 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
- 
- # Copy man pages
--FILE(GLOB MAN1 *.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN1_ROUTER mysqlrouter*.1)
-+FILE(GLOB MAN1 *.1)
-+FILE(GLOB MAN1_ROUTER mysqlroutermy_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  mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
- FILE(GLOB MAN8 *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_NDB AND NOT WITH_NDBCLUSTER)
+--- man/CMakeLists.txt.orig	2019-09-20 10:30:51.000000000 +0200
++++ man/CMakeLists.txt	2020-01-05 12:17:57.739101000 +0100
+@@ -54,37 +54,6 @@
+   perror.1
+   zlib_decompress.1
+   )
+-SET(MAN1_NDB
+-  ndb-common-options.1
+-  ndb_blob_tool.1
+-  ndb_config.1
+-  ndb_cpcd.1
+-  ndb_delete_all.1
+-  ndb_desc.1
+-  ndb_drop_index.1
+-  ndb_drop_table.1
+-  ndb_error_reporter.1
+-  ndb_import.1
+-  ndb_index_stat.1
+-  ndb_mgm.1
+-  ndb_move_data.1
+-  ndb_perror.1
+-  ndb_print_backup_file.1
+-  ndb_print_file.1
+-  ndb_print_frag_file.1
+-  ndb_print_schema_file.1
+-  ndb_print_sys_file.1
+-  ndb_redo_log_reader.1
+-  ndb_restore.1
+-  ndb_select_all.1
+-  ndb_select_count.1
+-  ndb_setup.py.1
+-  ndb_show_tables.1
+-  ndb_size.pl.1
+-  ndb_top.1
+-  ndb_waiter.1
+-  ndbinfo_select_all.1
+-)
+ SET(MAN1_ROUTER
+   mysqlrouter.1
+   mysqlrouter_passwd.1
Index: files/patch-mysys__ssl_my__md5.cc
===================================================================
--- files/patch-mysys__ssl_my__md5.cc	(revision 521884)
+++ files/patch-mysys__ssl_my__md5.cc	(nonexistent)
@@ -1,11 +0,0 @@
---- mysys/my_md5.cc.orig	2018-04-08 06:44:49 UTC
-+++ mysys/my_md5.cc
-@@ -56,7 +56,7 @@ static void my_md5_hash(unsigned char *d
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
--#if !defined(HAVE_WOLFSSL)
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   fips_mode = FIPS_mode();
- #endif /* HAVE_WOLFSSL */
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,

Property changes on: files/patch-mysys__ssl_my__md5.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-plugin_x_client_sha256__scramble__generator.cc
===================================================================
--- files/patch-plugin_x_client_sha256__scramble__generator.cc	(revision 521884)
+++ files/patch-plugin_x_client_sha256__scramble__generator.cc	(nonexistent)
@@ -1,11 +0,0 @@
---- plugin/x/client/sha256_scramble_generator.cc.orig	2018-05-09 14:20:16 UTC
-+++ plugin/x/client/sha256_scramble_generator.cc
-@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsi
-     DBUG_RETURN(true);
-   }
-   m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);

Property changes on: files/patch-plugin_x_client_sha256__scramble__generator.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-plugin_x_client_xconnection__impl.cc
===================================================================
--- files/patch-plugin_x_client_xconnection__impl.cc	(revision 521884)
+++ files/patch-plugin_x_client_xconnection__impl.cc	(working copy)
@@ -1,13 +1,13 @@
---- plugin/x/client/xconnection_impl.cc.orig	2018-04-08 06:44:49 UTC
-+++ plugin/x/client/xconnection_impl.cc
-@@ -182,12 +182,12 @@ XError ssl_verify_server_cert(Vio *vio, 
-     return XError{CR_SSL_CONNECTION_ERROR, "Failed to get CN from CN entry"};
+--- plugin/x/client/xconnection_impl.cc.orig	2020-01-06 13:02:29.574843000 +0100
++++ plugin/x/client/xconnection_impl.cc	2020-01-06 13:55:57.485128000 +0100
+@@ -224,12 +224,12 @@ XError ssl_verify_server_cert(Vio *vio, const std::str
+                   true};
    }
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
 -  const auto cn = reinterpret_cast<char *>(ASN1_STRING_data(cn_asn1));
 -#else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)  
    const auto cn =
        reinterpret_cast<const char *>(ASN1_STRING_get0_data(cn_asn1));
 -#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
@@ -17,21 +17,3 @@
    const auto cn_len = static_cast<size_t>(ASN1_STRING_length(cn_asn1));
  
    // There should not be any NULL embedded in the CN
-@@ -451,7 +451,7 @@ XError Connection_impl::get_ssl_error(co
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -501,7 +501,7 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
-     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED};
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode((int)m_context->m_ssl_config.m_ssl_fips_mode, err_string) !=
-       1) {
Index: files/patch-sql-common_client.cc
===================================================================
--- files/patch-sql-common_client.cc	(revision 521884)
+++ files/patch-sql-common_client.cc	(nonexistent)
@@ -1,11 +0,0 @@
---- sql-common/client.cc.orig	2018-04-08 06:44:49 UTC
-+++ sql-common/client.cc
-@@ -5596,7 +5596,7 @@ int STDCALL mysql_options(MYSQL *mysql, 
- #endif
-       break;
-     case MYSQL_OPT_SSL_FIPS_MODE: {
--#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL)
-+#if defined(HAVE_OPENSSL) && !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-       mysql->options.extension->ssl_fips_mode = *(uint *)arg;

Property changes on: files/patch-sql-common_client.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-sql_auth_sha2__password__common.cc
===================================================================
--- files/patch-sql_auth_sha2__password__common.cc	(revision 521884)
+++ files/patch-sql_auth_sha2__password__common.cc	(nonexistent)
@@ -1,11 +0,0 @@
---- sql/auth/sha2_password_common.cc.orig	2018-05-06 18:47:55 UTC
-+++ sql/auth/sha2_password_common.cc
-@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsi
-     DBUG_RETURN(true);
-   }
-   m_ok = EVP_DigestFinal_ex(md_context, m_digest, NULL);
--#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);

Property changes on: files/patch-sql_auth_sha2__password__common.cc
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: files/patch-sql_mysqld.cc
===================================================================
--- files/patch-sql_mysqld.cc	(revision 521884)
+++ files/patch-sql_mysqld.cc	(working copy)
@@ -1,6 +1,6 @@
---- sql/mysqld.cc.orig	2018-10-07 08:44:22 UTC
-+++ sql/mysqld.cc
-@@ -4493,7 +4493,7 @@ static int warn_self_signed_ca() {
+--- sql/mysqld.cc.orig	2020-01-06 14:06:20.912811000 +0100
++++ sql/mysqld.cc	2020-01-06 14:09:20.202992000 +0100
+@@ -4797,7 +4797,7 @@ static int init_thread_environment() {
  
  static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
  
@@ -9,12 +9,3 @@
  #define FILE_LINE_ARGS
  #else
  #define FILE_LINE_ARGS , const char *, int
-@@ -4530,7 +4530,7 @@ static void init_ssl() {
- 
- static void init_ssl() {
- #ifdef HAVE_OPENSSL
--#if !defined(HAVE_WOLFSSL) && !defined(__sun)
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun)
- #if defined(HAVE_PSI_MEMORY_INTERFACE)
-   static PSI_memory_info all_openssl_memory[] = {
-       {&key_memory_openssl, "openssl_malloc", 0, 0,
Index: files/patch-sql_sys__vars.cc
===================================================================
--- files/patch-sql_sys__vars.cc	(revision 521884)
+++ files/patch-sql_sys__vars.cc	(working copy)
@@ -1,15 +1,15 @@
---- sql/sys_vars.cc.orig	2018-04-08 06:44:49 UTC
-+++ sql/sys_vars.cc
-@@ -1792,7 +1792,7 @@ static Sys_var_ulong Sys_interactive_tim
-     "The number of seconds the server waits for activity on an interactive "
-     "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));
+--- sql/sys_vars.cc.orig	2020-01-06 14:13:50.517237000 +0100
++++ sql/sys_vars.cc	2020-01-06 14:50:48.330565000 +0100
+@@ -1841,7 +1841,7 @@ static Sys_var_ulong Sys_connect_timeout(
+     "The number of seconds the mysqld server is waiting for a connect "
+     "packet before responding with 'Bad handshake'",
+     GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
+-    VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
++    VALID_RANGE(2, INT_MAX32 / 1000), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
  
- static Sys_var_ulong Sys_join_buffer_size(
-     "join_buffer_size", "The size of the buffer that is used for full joins",
-@@ -2594,7 +2594,7 @@ static Sys_var_ulong Sys_net_read_timeou
+ static Sys_var_ulong Sys_information_schema_stats_expiry(
+     "information_schema_stats_expiry",
+@@ -2890,7 +2890,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));
  
-@@ -2615,7 +2615,7 @@ static Sys_var_ulong Sys_net_write_timeo
+@@ -2911,7 +2911,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,39 +27,3 @@
      NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
      ON_UPDATE(fix_net_write_timeout));
  
-@@ -4098,7 +4098,7 @@ static Sys_var_charptr Sys_tls_version(
-     READ_ONLY GLOBAL_VAR(opt_tls_version), SSL_OPT(OPT_TLS_VERSION),
-     IN_FS_CHARSET, "TLSv1,TLSv1.1,TLSv1.2");
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
-@@ -4110,7 +4110,7 @@ static bool update_fips_mode(sys_var *, 
- }
- #endif
- 
--#ifdef HAVE_WOLFSSL
-+#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER)
- static const char *ssl_fips_mode_names[] = {"OFF", 0};
- #else
- static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", 0};
-@@ -4121,7 +4121,7 @@ static Sys_var_enum Sys_ssl_fips_mode(
-     GLOBAL_VAR(opt_ssl_fips_mode), SSL_OPT(OPT_SSL_FIPS_MODE),
-     ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
-     ON_CHECK(NULL),
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-     ON_UPDATE(update_fips_mode),
- #else
-     ON_UPDATE(NULL),
-@@ -4429,7 +4429,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-     "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: files/patch-vio_viosslfactories.cc
===================================================================
--- files/patch-vio_viosslfactories.cc	(revision 521884)
+++ files/patch-vio_viosslfactories.cc	(working copy)
@@ -1,6 +1,6 @@
---- vio/viosslfactories.cc.orig	2018-04-08 06:44:49 UTC
-+++ vio/viosslfactories.cc
-@@ -37,6 +37,7 @@
+--- vio/viosslfactories.cc.orig	2020-01-06 14:55:02.126558000 +0100
++++ vio/viosslfactories.cc	2020-01-06 14:58:42.247868000 +0100
+@@ -38,6 +38,7 @@
  
  #ifdef HAVE_OPENSSL
  #include <openssl/dh.h>
@@ -8,7 +8,7 @@
  
  #define TLS_VERSION_OPTION_SIZE 256
  #define SSL_CIPHER_LIST_SIZE 4096
-@@ -135,7 +136,7 @@ static DH *get_dh2048(void) {
+@@ -136,7 +137,7 @@ static DH *get_dh2048(void) {
      BIGNUM *p = BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
      BIGNUM *g = BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
      if (!p || !g
@@ -17,7 +17,7 @@
          || !DH_set0_pqg(dh, p, NULL, g)
  #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
      ) {
-@@ -143,7 +144,7 @@ static DH *get_dh2048(void) {
+@@ -144,7 +145,7 @@ static DH *get_dh2048(void) {
        DH_free(dh);
        return NULL;
      }
@@ -26,31 +26,3 @@
      dh->p = p;
      dh->g = g;
  #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -426,7 +427,7 @@ void ssl_start() {
-   }
- }
- 
--#ifndef HAVE_WOLFSSL
-+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER)
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -449,6 +450,10 @@ int set_fips_mode(const uint fips_mode, 
-   int rc = -1;
-   unsigned int fips_mode_old = -1;
-   unsigned long err_library = 0;
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+  err_string="LibreSSL deosn't have FIPS_mode functionas";
-+  goto EXIT;
-+#else
-   if (fips_mode > 2) {
-     goto EXIT;
-   }
-@@ -462,6 +467,7 @@ int set_fips_mode(const uint fips_mode, 
-     ERR_error_string_n(err_library, err_string, OPENSSL_ERROR_LENGTH - 1);
-     err_string[OPENSSL_ERROR_LENGTH - 1] = '\0';
-   }
-+#endif
- EXIT:
-   return rc;
- }