forked from Lainports/freebsd-ports
342c784ae3
switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH
55 lines
2.7 KiB
C++
55 lines
2.7 KiB
C++
--- sql/sys_vars.cc.orig 2019-09-20 08:30:51 UTC
|
|
+++ sql/sys_vars.cc
|
|
@@ -1841,7 +1841,7 @@ static Sys_var_ulong Sys_connect_timeout(
|
|
"The number of seconds the mysqld server is waiting for a connect "
|
|
"packet before responding with 'Bad handshake'",
|
|
GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
|
|
- VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
|
|
+ VALID_RANGE(2, INT_MAX32 / 1000), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
|
|
|
|
static Sys_var_ulong Sys_information_schema_stats_expiry(
|
|
"information_schema_stats_expiry",
|
|
@@ -2890,7 +2890,7 @@ static Sys_var_ulong Sys_net_read_timeout(
|
|
"Number of seconds to wait for more data from a connection before "
|
|
"aborting the read",
|
|
SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
|
|
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
|
|
+ VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
|
|
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
|
|
ON_UPDATE(fix_net_read_timeout));
|
|
|
|
@@ -2911,7 +2911,7 @@ static Sys_var_ulong Sys_net_write_timeout(
|
|
"Number of seconds to wait for a block to be written to a connection "
|
|
"before aborting the write",
|
|
SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
|
|
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
|
|
+ VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
|
|
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
|
|
ON_UPDATE(fix_net_write_timeout));
|
|
|
|
@@ -4416,7 +4416,7 @@ static Sys_var_ulong Sys_max_execution_time(
|
|
"milliseconds",
|
|
HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
|
|
VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
|
|
-
|
|
+#ifndef LIBRESSL_VERSION_NUMBER
|
|
static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
|
|
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
|
|
if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
|
|
@@ -4436,6 +4436,16 @@ static Sys_var_enum Sys_ssl_fips_mode(
|
|
GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
|
|
ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
|
|
ON_CHECK(NULL), ON_UPDATE(update_fips_mode), NULL);
|
|
+#else
|
|
+static const char *ssl_fips_mode_names[] = {"OFF", 0};
|
|
+static Sys_var_enum Sys_ssl_fips_mode(
|
|
+ "ssl_fips_mode",
|
|
+ "SSL FIPS mode (applies only for OpenSSL); "
|
|
+ "permitted values are: OFF",
|
|
+ GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
|
|
+ ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
|
|
+ ON_CHECK(NULL), ON_UPDATE(NULL), NULL);
|
|
+#endif
|
|
|
|
#if defined(HAVE_OPENSSL)
|
|
static Sys_var_bool Sys_auto_generate_certs(
|