diff options
| author | ale <ale@FreeBSD.org> | 2012-06-15 23:49:41 +0800 |
|---|---|---|
| committer | ale <ale@FreeBSD.org> | 2012-06-15 23:49:41 +0800 |
| commit | 2f03fff9019c81c3013078424070a925ad581e74 (patch) | |
| tree | 83a12c30a36e41528d7204ab43aeeedaade56679 /databases/mysql55-server | |
| parent | 85ce412c82f02dcd27e7387ac4aa1bcc0ceb3f0d (diff) | |
| download | freebsd-ports-gnome-2f03fff9019c81c3013078424070a925ad581e74.tar.gz freebsd-ports-gnome-2f03fff9019c81c3013078424070a925ad581e74.tar.zst freebsd-ports-gnome-2f03fff9019c81c3013078424070a925ad581e74.zip | |
Add a patch to lower the valid range of mysql read/write/wait timeouts.
Such timeouts are implemented via setsockopt that doesn't accept values
larger than (INT_MAX / kern.hz).
Diffstat (limited to 'databases/mysql55-server')
| -rw-r--r-- | databases/mysql55-server/files/patch-sql_sys_vars.cc | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/databases/mysql55-server/files/patch-sql_sys_vars.cc b/databases/mysql55-server/files/patch-sql_sys_vars.cc new file mode 100644 index 000000000000..e8f0caff4aff --- /dev/null +++ b/databases/mysql55-server/files/patch-sql_sys_vars.cc @@ -0,0 +1,38 @@ +--- sql/sys_vars.cc.orig 2012-06-15 17:03:32.000000000 +0200 ++++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 +@@ -900,7 +900,7 @@ + "connection before closing it", + 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_ulong Sys_join_buffer_size( + "join_buffer_size", +@@ -1401,7 +1401,7 @@ + "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)); + +@@ -1416,7 +1416,7 @@ + "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)); + +@@ -2257,7 +2257,7 @@ + "The number of seconds the server waits for activity on a " + "connection before closing it", + 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)); + + /** propagates changes to the relevant flag of @@optimizer_switch */ |