| 1 |
--- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC |
| 2 |
+++ sql/sys_vars.cc |
| 3 |
@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim |
| 4 |
"connection before closing it", |
| 5 |
SESSION_VAR(net_interactive_timeout), |
| 6 |
CMD_LINE(REQUIRED_ARG), |
| 7 |
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); |
| 8 |
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); |
| 9 |
|
| 10 |
static Sys_var_ulong Sys_join_buffer_size( |
| 11 |
"join_buffer_size", |
| 12 |
@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou |
| 13 |
"Number of seconds to wait for more data from a connection before " |
| 14 |
"aborting the read", |
| 15 |
SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), |
| 16 |
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), |
| 17 |
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), |
| 18 |
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), |
| 19 |
ON_UPDATE(fix_net_read_timeout)); |
| 20 |
|
| 21 |
@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo |
| 22 |
"Number of seconds to wait for a block to be written to a connection " |
| 23 |
"before aborting the write", |
| 24 |
SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG), |
| 25 |
- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), |
| 26 |
+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), |
| 27 |
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), |
| 28 |
ON_UPDATE(fix_net_write_timeout)); |
| 29 |
|
| 30 |
@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou |
| 31 |
"The number of seconds the server waits for activity on a " |
| 32 |
"connection before closing it", |
| 33 |
SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), |
| 34 |
- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), |
| 35 |
+ VALID_RANGE(1, INT_MAX32/1000), |
| 36 |
DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); |
| 37 |
|
| 38 |
static Sys_var_plugin Sys_default_storage_engine( |
