diff options
Diffstat (limited to 'databases/mysql80-server/files/patch-sql_mysqld.cc')
| -rw-r--r-- | databases/mysql80-server/files/patch-sql_mysqld.cc | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/databases/mysql80-server/files/patch-sql_mysqld.cc b/databases/mysql80-server/files/patch-sql_mysqld.cc index a8eccb94f647..484af751b704 100644 --- a/databases/mysql80-server/files/patch-sql_mysqld.cc +++ b/databases/mysql80-server/files/patch-sql_mysqld.cc @@ -1,6 +1,6 @@ ---- sql/mysqld.cc.orig 2021-12-17 16:07:27 UTC +--- sql/mysqld.cc.orig 2022-07-06 21:36:34 UTC +++ sql/mysqld.cc -@@ -5285,7 +5285,7 @@ static int init_thread_environment() { +@@ -5299,7 +5299,7 @@ static int init_thread_environment() { static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; @@ -9,18 +9,3 @@ #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int -@@ -5316,12 +5316,14 @@ static void init_ssl() { - } - - static int init_ssl_communication() { -+#ifndef LIBRESSL_VERSION_NUMBER - char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; - int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); - if (ret_fips_mode != 1) { - LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); - return 1; - } -+#endif /* LIBRESSL_VERSION_NUMBER */ - if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl, - &server_main_callback, opt_initialize)) - return 1; |