From f8b9a0372aa207512fb7d4e331d1f9898455d090 Mon Sep 17 00:00:00 2001 From: Vasil Dimov Date: Tue, 23 Jul 2019 06:24:24 +0000 Subject: databases/mysqlwsrep57-server: Upgrade from 5.7.25 to 5.7.26 PR: 239374 Submitted by: Teemu Ollakka --- databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc') diff --git a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc index e21d62430970..1ee60cfb8afc 100644 --- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc +++ b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc @@ -1,6 +1,6 @@ ---- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC +--- sql/sys_vars.cc.orig 2019-07-17 18:38:36 UTC +++ sql/sys_vars.cc -@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim +@@ -1741,7 +1741,7 @@ static Sys_var_ulong Sys_interactive_timeout( "connection before closing it", SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), @@ -9,7 +9,7 @@ static Sys_var_ulong Sys_join_buffer_size( "join_buffer_size", -@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou +@@ -2621,7 +2621,7 @@ static Sys_var_ulong Sys_net_read_timeout( "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)); -@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo +@@ -2645,7 +2645,7 @@ static Sys_var_ulong Sys_net_write_timeout( "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)); -@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou +@@ -4369,7 +4369,7 @@ static Sys_var_ulong Sys_net_wait_timeout( "The number of seconds the server waits for activity on a " "connection before closing it", SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- cgit v1.2.3