summaryrefslogtreecommitdiff
path: root/databases/mysql80-server/files/patch-sql_mysqld.cc
diff options
context:
space:
mode:
authorMahdi Mokhtari <mmokhi@FreeBSD.org>2018-05-12 15:35:25 +0000
committerMahdi Mokhtari <mmokhi@FreeBSD.org>2018-05-12 15:35:25 +0000
commitacca27b6ca8327e93f12cb06800447a44129d72a (patch)
tree82f92efa85f110d6c1ceb5c7f78a94138fbaaf69 /databases/mysql80-server/files/patch-sql_mysqld.cc
parentsysutils/fusefs-libs: sort USES (diff)
databases/mysql80-{client,server}: Upgrade the ports to GA version 8.0.11
Fix build with LibreSSL and OpenSSL-devel ports as well MySQL 8.0.11 is the General Availability (GA) version of MySQL 8. MySQL since this version supports FIPS-mode, if compiled using OpenSSL, AND an OpenSSL library and FIPS Object Module are available at runtime. FIPS mode imposes conditions on cryptographic operations such as restrictions on acceptable encryption algorithms or requirements for longer key lengths. The --ssl-fips-mode client option enables control of FIPS mode on the client side for: mysql, mysqladmin, mysqlbinlog, mysqlcheck, mysqldump, mysqlimport, mysqlpump, ... This update includes bugfixes including (not limited to): -InnoDB: The server was stopped before a fatal error message was written to the error log. -InnoDB: An incorrect GROUP BY result was returned when using the TempTable storage engine and a NO PAD collation. -InnoDB: The data retrieved from INFORMATION_SCHEMA.INNODB_COLUMNS was incorrect for tables containing a virtual column. Full Release-Notes are available at: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-11.html
Notes
Notes: svn path=/head/; revision=469734
Diffstat (limited to 'databases/mysql80-server/files/patch-sql_mysqld.cc')
-rw-r--r--databases/mysql80-server/files/patch-sql_mysqld.cc29
1 files changed, 29 insertions, 0 deletions
diff --git a/databases/mysql80-server/files/patch-sql_mysqld.cc b/databases/mysql80-server/files/patch-sql_mysqld.cc
new file mode 100644
index 000000000000..6f679b5d516c
--- /dev/null
+++ b/databases/mysql80-server/files/patch-sql_mysqld.cc
@@ -0,0 +1,29 @@
+--- sql/mysqld.cc.orig 2018-04-08 06:44:49 UTC
++++ sql/mysqld.cc
+@@ -4309,7 +4309,7 @@ static int warn_self_signed_ca() {
+ static void init_ssl() {
+ #ifdef HAVE_OPENSSL
+ #ifndef HAVE_WOLFSSL
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ CRYPTO_malloc_init();
+ #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ OPENSSL_malloc_init();
+@@ -4321,7 +4321,7 @@ static void init_ssl() {
+
+ static int init_ssl_communication() {
+ #ifdef HAVE_OPENSSL
+-#ifndef HAVE_WOLFSSL
++#if !defined(HAVE_WOLFSSL) && !defined(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) {
+@@ -8647,7 +8647,7 @@ bool mysqld_get_one_option(int optid,
+ One can disable SSL later by using --skip-ssl or --ssl=0.
+ */
+ opt_use_ssl = true;
+-#ifdef HAVE_WOLFSSL
++#if defined(HAVE_WOLFSSL) || defined(LIBRESSL_VERSION_NUMBER)
+ /* crl has no effect in wolfSSL. */
+ opt_ssl_crl = NULL;
+ opt_ssl_crlpath = NULL;