Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb101-server/files/patch-sql_sys__vars.cc
--- sql/sys_vars.cc.orig 2015-06-17 14:54:13 UTC | Fix clang build error | ||||
--- sql/sys_vars.cc.orig 2015-10-15 15:43:47 UTC | |||||
+++ sql/sys_vars.cc | +++ sql/sys_vars.cc | ||||
@@ -1012,7 +1012,7 @@ static Sys_var_ulong Sys_interactive_tim | @@ -1040,7 +1040,7 @@ static Sys_var_ulong Sys_interactive_tim | ||||
"connection before closing it", | "connection before closing it", | ||||
SESSION_VAR(net_interactive_timeout), | NO_SET_STMT 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_ulonglong Sys_join_buffer_size( | static Sys_var_ulonglong Sys_join_buffer_size( | ||||
"join_buffer_size", | "join_buffer_size", | ||||
@@ -2046,7 +2046,7 @@ static Sys_var_ulong Sys_net_read_timeou | @@ -2214,7 +2214,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)); | ||||
@@ -2061,7 +2061,7 @@ static Sys_var_ulong Sys_net_write_timeo | @@ -2229,7 +2229,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)); | ||||
@@ -3291,7 +3291,7 @@ static Sys_var_ulong Sys_net_wait_timeou | @@ -3424,7 +3424,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), | NO_SET_STMT 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)); | ||||
static Sys_var_plugin Sys_default_storage_engine( | static Sys_var_plugin Sys_default_storage_engine( |