diff options
| author | Vasil Dimov <vd@FreeBSD.org> | 2019-07-22 15:34:37 +0000 |
|---|---|---|
| committer | Vasil Dimov <vd@FreeBSD.org> | 2019-07-22 15:34:37 +0000 |
| commit | 7277b3486dc955e267eee59e168f16cb99cb2400 (patch) | |
| tree | 9b167ffc246b1e8bcf6a9c3ee6610c8e47b2259c /databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc | |
| parent | Update to the 20180720 snapshot of GCC 9.1.1. (diff) | |
databases/mysqlwsrep56-server: Upgrade from 5.6.43 to 5.6.44
PR: 239373
Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Notes
Notes:
svn path=/head/; revision=507145
Diffstat (limited to 'databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc')
| -rw-r--r-- | databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc index e8f0caff4aff..75da7d5f0d4a 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 2012-06-15 17:03:32.000000000 +0200 -+++ sql/sys_vars.cc 2012-06-15 17:16:23.000000000 +0200 -@@ -900,7 +900,7 @@ +--- sql/sys_vars.cc.orig 2019-07-16 14:08:43 UTC ++++ sql/sys_vars.cc +@@ -1415,7 +1415,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", -@@ -1401,7 +1401,7 @@ +@@ -2034,7 +2034,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)); -@@ -1416,7 +1416,7 @@ +@@ -2049,7 +2049,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)); -@@ -2257,7 +2257,7 @@ +@@ -3182,7 +3182,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), @@ -35,4 +35,4 @@ + VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - /** propagates changes to the relevant flag of @@optimizer_switch */ + static Sys_var_plugin Sys_default_storage_engine( |