Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mariadb101-server/files/patch-sql_sys__vars.cc
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| Fix clang build error | |||||
| --- sql/sys_vars.cc.orig 2015-10-15 15:43:47 UTC | |||||
| +++ sql/sys_vars.cc | |||||
| @@ -1040,7 +1040,7 @@ static Sys_var_ulong Sys_interactive_tim | |||||
| "connection before closing it", | |||||
| NO_SET_STMT SESSION_VAR(net_interactive_timeout), | |||||
| CMD_LINE(REQUIRED_ARG), | |||||
| - 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)); | |||||
| static Sys_var_ulonglong Sys_join_buffer_size( | |||||
| "join_buffer_size", | |||||
| @@ -2214,7 +2214,7 @@ static Sys_var_ulong Sys_net_read_timeou | |||||
| "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)); | |||||
| @@ -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 " | |||||
| "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)); | |||||
| @@ -3424,7 +3424,7 @@ static Sys_var_ulong Sys_net_wait_timeou | |||||
| "The number of seconds the server waits for activity on a " | |||||
| "connection before closing it", | |||||
| 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, INT_MAX32/1000), | |||||
| DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); | |||||
| static Sys_var_plugin Sys_default_storage_engine( | |||||