summaryrefslogtreecommitdiff
path: root/databases/percona56-server/files/patch-sql_sys_vars.cc
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2013-03-18 21:18:03 +0000
committerFlorian Smeets <flo@FreeBSD.org>2013-03-18 21:18:03 +0000
commitb3098a74ff511e4a0d888651d13012cd028253c5 (patch)
treea8be09d9019ee84fee17b8bbeb802a846eb70c4d /databases/percona56-server/files/patch-sql_sys_vars.cc
parentRemove non-existent WWW (diff)
Add the 5.6 branch of Percona-Server.
While MySQL 5.6.10 is considered GA, Percona still considers Percona-Server 5.6.10 alpha software.
Diffstat (limited to 'databases/percona56-server/files/patch-sql_sys_vars.cc')
-rw-r--r--databases/percona56-server/files/patch-sql_sys_vars.cc38
1 files changed, 38 insertions, 0 deletions
diff --git a/databases/percona56-server/files/patch-sql_sys_vars.cc b/databases/percona56-server/files/patch-sql_sys_vars.cc
new file mode 100644
index 000000000000..e8f0caff4aff
--- /dev/null
+++ b/databases/percona56-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 */