diff options
| author | Jochen Neumeister <joneum@FreeBSD.org> | 2020-07-14 18:00:34 +0000 |
|---|---|---|
| committer | Jochen Neumeister <joneum@FreeBSD.org> | 2020-07-14 18:00:34 +0000 |
| commit | 904e2c69b75352a06aae4cbe492c64be08a09abc (patch) | |
| tree | ac56e7fd7272dac9b0f84272002b0365930e705c /databases/mysql80-server/files/patch-sql_mysqld.cc | |
| parent | Remove devel/py-jailconf, koobs beat me to it (diff) | |
databases/mysql80-{client, server}: Update to latest release 8.0.21
Full Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-21.html
Submitted by: fluffy
MFH: 2020Q3
Security: 0ed71663-c369-11ea-b53c-d4c9ef517024
Sponsored by: Netzkommune GmbH
Notes
Notes:
svn path=/head/; revision=542227
Diffstat (limited to 'databases/mysql80-server/files/patch-sql_mysqld.cc')
| -rw-r--r-- | databases/mysql80-server/files/patch-sql_mysqld.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/mysql80-server/files/patch-sql_mysqld.cc b/databases/mysql80-server/files/patch-sql_mysqld.cc index 8b283e401563..39a7fb89844a 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 2019-09-20 08:30:51 UTC +++ sql/mysqld.cc -@@ -4818,7 +4818,7 @@ static int init_thread_environment() { +@@ -5109,7 +5109,7 @@ static int init_thread_environment() { static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED; @@ -9,7 +9,7 @@ #define FILE_LINE_ARGS #else #define FILE_LINE_ARGS , const char *, int -@@ -4854,12 +4854,14 @@ static void init_ssl() { +@@ -5143,12 +5143,14 @@ static void init_ssl() { } static int init_ssl_communication() { @@ -21,6 +21,6 @@ return 1; } +#endif /* LIBRESSL_VERSION_NUMBER */ - if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1; - - #if OPENSSL_VERSION_NUMBER < 0x10100000L + if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl, + &server_main_callback, opt_initialize)) + return 1; |