summaryrefslogtreecommitdiff
path: root/databases/percona57-server/files/patch-sql_sys__vars.cc
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2017-01-10 18:54:32 +0000
committerMark Felder <feld@FreeBSD.org>2017-01-10 18:54:32 +0000
commitf5a7bbe20b44e2ed7ce2b3d6d9ce2e9d94056ac8 (patch)
tree9dbb8720f9319f45cd7516be53e22a9d6faa015f /databases/percona57-server/files/patch-sql_sys__vars.cc
parentNew port: audio/sratom (diff)
Welcome Percona 5.7 ports to the tree
- client and server version 5.7.16-10 - pam-for-mysql: compatible with newer MySQL API (MySQL 5.7+) Thanks to all who have worked on Percona, MariaDB, and MySQL ports. Your tireless efforts have been instrumental in making this port happen. Differential Revision: https://reviews.freebsd.org/D8785
Notes
Notes: svn path=/head/; revision=431126
Diffstat (limited to 'databases/percona57-server/files/patch-sql_sys__vars.cc')
-rw-r--r--databases/percona57-server/files/patch-sql_sys__vars.cc38
1 files changed, 38 insertions, 0 deletions
diff --git a/databases/percona57-server/files/patch-sql_sys__vars.cc b/databases/percona57-server/files/patch-sql_sys__vars.cc
new file mode 100644
index 000000000000..1d1cb73e49a2
--- /dev/null
+++ b/databases/percona57-server/files/patch-sql_sys__vars.cc
@@ -0,0 +1,38 @@
+--- sql/sys_vars.cc.orig 2016-11-27 19:44:54 UTC
++++ sql/sys_vars.cc
+@@ -1804,7 +1804,7 @@ static Sys_var_ulong Sys_interactive_tim
+ "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",
+@@ -2696,7 +2696,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));
+
+@@ -2720,7 +2720,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));
+
+@@ -4406,7 +4406,7 @@ static Sys_var_ulong Sys_net_wait_timeou
+ "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));
+
+ static Sys_var_plugin Sys_default_storage_engine(