summaryrefslogtreecommitdiff
path: root/databases/mysql57-server/files/patch-sql_sys__vars.cc
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2016-05-06 14:39:59 +0000
committerThomas Zander <riggs@FreeBSD.org>2016-05-06 14:39:59 +0000
commitf83159f188ed7d4e1b0ed7375af1898a91b93115 (patch)
tree6202c20e1750ae483e43d855296c8ffeaa5ace65 /databases/mysql57-server/files/patch-sql_sys__vars.cc
parentnet/isboot-kmod: fix build on 11-current (diff)
Update to 5.7.12, fixing 31 partially critical vulnerabilities
List of vulnerabilities is documented on: http://vuxml.freebsd.org/freebsd/8c2b2f11-0ebe-11e6-b55e-b499baebfeaf.html CVE IDs see below. PR: 206998 Submitted by: mokhi64@gmail.com (maintainer) Reviewed by: rootservice@gmail.com Approved by: mokhi64@gmail.com (maintainer) MFH: 2016Q2 Security: CVE-2016-0705 CVE-2016-0639 CVE-2015-3194 CVE-2016-0640 CVE-2016-0641 CVE-2016-3461 CVE-2016-2047 CVE-2016-0642 CVE-2016-0643 CVE-2016-0644 CVE-2016-0646 CVE-2016-0647 CVE-2016-0648 CVE-2016-0649 CVE-2016-0650 CVE-2016-0652 CVE-2016-0653 CVE-2016-0654 CVE-2016-0655 CVE-2016-0656 CVE-2016-0657 CVE-2016-0658 CVE-2016-0651 CVE-2016-0659 CVE-2016-0661 CVE-2016-0662 CVE-2016-0663 CVE-2016-0665 CVE-2016-0666 CVE-2016-0667 CVE-2016-0668
Notes
Notes: svn path=/head/; revision=414707
Diffstat (limited to 'databases/mysql57-server/files/patch-sql_sys__vars.cc')
-rw-r--r--databases/mysql57-server/files/patch-sql_sys__vars.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/mysql57-server/files/patch-sql_sys__vars.cc b/databases/mysql57-server/files/patch-sql_sys__vars.cc
index 7b731cbe5c5e..e21d62430970 100644
--- a/databases/mysql57-server/files/patch-sql_sys__vars.cc
+++ b/databases/mysql57-server/files/patch-sql_sys__vars.cc
@@ -1,4 +1,4 @@
---- sql/sys_vars.cc.orig 2015-11-29 19:16:24 UTC
+--- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC
+++ sql/sys_vars.cc
@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
"connection before closing it",
@@ -9,7 +9,7 @@
static Sys_var_ulong Sys_join_buffer_size(
"join_buffer_size",
-@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou
+@@ -2552,7 +2552,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),
@@ -18,7 +18,7 @@
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_net_read_timeout));
-@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo
+@@ -2568,7 +2568,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),
@@ -27,7 +27,7 @@
NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
ON_UPDATE(fix_net_write_timeout));
-@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou
+@@ -4083,7 +4083,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),