diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2022-08-29 21:35:22 +0300 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2022-08-29 21:35:22 +0300 |
| commit | 51f1bac825cdf7499d0920955cc7d0d35ac83583 (patch) | |
| tree | 559d01ddd165c80061a7f8dc7a8117cf526d4a70 /databases/percona57-server/files/patch-sql_mysqld.cc | |
| parent | devel/qt6-positioning: new port - provides positioning information via QML an... (diff) | |
databases/percona75[*]: update to 5.7.39-42 release (+)
Release Notes: https://docs.percona.com/percona-server/5.7/release-notes/Percona-Server-5.7.38-41.html \
https://docs.percona.com/percona-server/5.7/release-notes/Percona-Server-5.7.39-42.html
Diffstat (limited to 'databases/percona57-server/files/patch-sql_mysqld.cc')
| -rw-r--r-- | databases/percona57-server/files/patch-sql_mysqld.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/databases/percona57-server/files/patch-sql_mysqld.cc b/databases/percona57-server/files/patch-sql_mysqld.cc index 184ace5eab3e..c967c9ea01b1 100644 --- a/databases/percona57-server/files/patch-sql_mysqld.cc +++ b/databases/percona57-server/files/patch-sql_mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig 2016-11-27 19:44:54 UTC +--- sql/mysqld.cc.orig 2022-08-05 18:25:13 UTC +++ sql/mysqld.cc -@@ -1517,6 +1517,16 @@ static void clean_up_mutexes() +@@ -1531,6 +1531,16 @@ static void clean_up_mutexes() ****************************************************************************/ /* Initialise proxy protocol. */ @@ -17,17 +17,17 @@ static void set_proxy() { const char *p; -@@ -3678,6 +3688,7 @@ static int init_ssl() +@@ -3706,6 +3716,7 @@ static int init_ssl() + static int init_ssl() { #ifdef HAVE_OPENSSL +#ifndef LIBRESSL_VERSION_NUMBER - int fips_mode= FIPS_mode(); - if (fips_mode != 0) - { - /* FIPS is enabled, Log warning and Disable it now */ -@@ -3687,7 +3698,9 @@ static int init_ssl() - " Disabling FIPS."); + + #if OPENSSL_VERSION_NUMBER >= 0x30000000L + int fips_mode= EVP_default_properties_is_fips_enabled(NULL) && +@@ -3726,7 +3737,9 @@ static int init_ssl() FIPS_mode_set(0); + #endif } -#if OPENSSL_VERSION_NUMBER < 0x10100000L +#endif |