63fec1d6d4
- Update to version 10.1.13
- Make GSSAPI plugin optional [2]
- Remove patches that are merged upstream
- Re-generate patches that required fuzzing
- Server
- Fix OQGraph build failure [1]
- Install server gssapi plugin only
- Don't install gssapi libs/files that were moved to -client
- Add license and readme file for TokuDB
- Add tokuft_logprint and tokuftdump binaries
- Client
- Install client gssapi plugin
- Enable PLIST_SUB for optional gssapi plugin
- Add new plugins and ini file
- Remove taocrypt patch, we don't build bundled SSL
PR: 207675 [1], 207883 [2]
Reviewed by: feld (mentor)
Approved by: feld (mentor)
Differential Revision: D5751
40 lines
1.9 KiB
C++
40 lines
1.9 KiB
C++
Fix clang build error
|
|
|
|
--- sql/sys_vars.cc.orig 2016-03-24 09:12:12 UTC
|
|
+++ sql/sys_vars.cc
|
|
@@ -1052,7 +1052,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",
|
|
@@ -2239,7 +2239,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));
|
|
|
|
@@ -2254,7 +2254,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));
|
|
|
|
@@ -3449,7 +3449,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(
|