Page MenuHomeFreeBSD
Differential D9427 Diff 24697 databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc

Changeset View

Standalone View

View Options

databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc

  • This file was copied from databases/mysql56-server/files/patch-sql_sys_vars.cc.
--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 --- sql/sys_vars.cc.orig 2017-01-25 07:58:07 UTC
+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 +++ sql/sys_vars.cc
@@ -900,7 +900,7 @@ @@ -1412,7 +1412,7 @@ static Sys_var_ulong Sys_interactive_tim
"connection before closing it", "connection before closing it",
SESSION_VAR(net_interactive_timeout), SESSION_VAR(net_interactive_timeout),
CMD_LINE(REQUIRED_ARG), CMD_LINE(REQUIRED_ARG),
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
static Sys_var_ulong Sys_join_buffer_size( static Sys_var_ulong Sys_join_buffer_size(
"join_buffer_size", "join_buffer_size",
@@ -1401,7 +1401,7 @@ @@ -2000,7 +2000,7 @@ static Sys_var_ulong Sys_net_read_timeou
"Number of seconds to wait for more data from a connection before " "Number of seconds to wait for more data from a connection before "
"aborting the read", "aborting the read",
SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - 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), + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_net_read_timeout)); ON_UPDATE(fix_net_read_timeout));
@@ -1416,7 +1416,7 @@ @@ -2015,7 +2015,7 @@ static Sys_var_ulong Sys_net_write_timeo
"Number of seconds to wait for a block to be written to a connection " "Number of seconds to wait for a block to be written to a connection "
"before aborting the write", "before aborting the write",
SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - 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), + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_net_write_timeout)); ON_UPDATE(fix_net_write_timeout));
@@ -2257,7 +2257,7 @@ @@ -3148,7 +3148,7 @@ static Sys_var_ulong Sys_net_wait_timeou
"The number of seconds the server waits for activity on a " "The number of seconds the server waits for activity on a "
"connection before closing it", "connection before closing it",
SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), - VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
+ VALID_RANGE(1, INT_MAX32/1000), + VALID_RANGE(1, INT_MAX32/1000),
DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
/** propagates changes to the relevant flag of @@optimizer_switch */ static Sys_var_plugin Sys_default_storage_engine(