diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2019-11-02 15:18:26 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2019-11-02 15:18:26 +0000 |
| commit | f183749b1c71c5f1c3763b3d2b2f11a497b11f5f (patch) | |
| tree | 69fddc35094cc12931115080d9bc9fb7de897268 /databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc | |
| parent | Update patches imported from asterisk project to latest version. (diff) | |
databases/mysqlwsrep56-server: upgrade 5.6.45-25.27 -> 5.6.46-25.28
PR: 241533
Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt
Notes
Notes:
svn path=/head/; revision=516331
Diffstat (limited to 'databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc')
| -rw-r--r-- | databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc index 75da7d5f0d4a..872524393853 100644 --- a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc +++ b/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc @@ -1,6 +1,6 @@ ---- sql/sys_vars.cc.orig 2019-07-16 14:08:43 UTC +--- sql/sys_vars.cc.orig 2019-10-21 05:17:49 UTC +++ sql/sys_vars.cc -@@ -1415,7 +1415,7 @@ static Sys_var_ulong Sys_interactive_timeout( +@@ -1422,7 +1422,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", -@@ -2034,7 +2034,7 @@ static Sys_var_ulong Sys_net_read_timeout( +@@ -2041,7 +2041,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)); -@@ -2049,7 +2049,7 @@ static Sys_var_ulong Sys_net_write_timeout( +@@ -2056,7 +2056,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)); -@@ -3182,7 +3182,7 @@ static Sys_var_ulong Sys_net_wait_timeout( +@@ -3189,7 +3189,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), |