forked from Lainports/freebsd-ports
152db2a96e
- New FPROFILE_GENERATE and FPROFILE_USE CMake options are available for experimenting with profile guided optimization (PGO) with GCC. See the cmake/fprofile.cmake in a MySQL source distribution for information about using them. These options have been tested with GCC 8 and 9, and with Clang. - Enabling FPROFILE_USE also enables WITH_LTO (link time optimization). - Innodb_system_rows_read, Innodb_system_rows_inserted, Innodb_system_rows_deleted status variables were added for counting row operations on InnoDB tables that belong to system-created schemas. The new status variables are similar to the existing Innodb_rows_read, Innodb_rows_inserted, Innodb_rows_deleted status variables, which count operations on InnoDB tables that belong to both user-created and system-created schemas. - The new status variables are useful in replication environments where relay_log_info_repository and master_info_repository variables are set to TABLE, resulting in higher row operation counts on slaves due to operations performed on the slave_master_info, slave_replay_log_info, and slave_worker_info tables, which belong to the system-created mysql schema. For a valid comparison of master and slave row operation counts, operations on tables in system-created schemas can now be excluded using the count data provided by the new status variables. More infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-19.html Submitted by: fluffy Approved by: mmokhi (maintainer, implicit) Sponsored by: Netzkommune GmbH
26 lines
908 B
C++
26 lines
908 B
C++
--- sql/mysqld.cc.orig 2019-09-20 08:30:51 UTC
|
|
+++ sql/mysqld.cc
|
|
@@ -4818,7 +4818,7 @@ static int init_thread_environment() {
|
|
|
|
static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
|
#define FILE_LINE_ARGS
|
|
#else
|
|
#define FILE_LINE_ARGS , const char *, int
|
|
@@ -4854,12 +4854,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 (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1;
|
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|