diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-03-27 20:57:51 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-03-27 20:57:51 +0000 |
| commit | 63fec1d6d4f53c480ff3db3308e0da8e029ca027 (patch) | |
| tree | 8c457b51b278855ab62a43afb7b75378462e9a63 /databases/mariadb101-server/files/patch-sql_sys__vars.cc | |
| parent | New port: multimedia/plexwatch (diff) | |
databases/mariadb101-{server,client}: Update to 10.1.13
- Update to version 10.1.13
- Make GSSAPI plugin optional [2]
- Remove patches that are merged upstream
- Re-generate patches that required fuzzing
- Server
- Fix OQGraph build failure [1]
- Install server gssapi plugin only
- Don't install gssapi libs/files that were moved to -client
- Add license and readme file for TokuDB
- Add tokuft_logprint and tokuftdump binaries
- Client
- Install client gssapi plugin
- Enable PLIST_SUB for optional gssapi plugin
- Add new plugins and ini file
- Remove taocrypt patch, we don't build bundled SSL
PR: 207675 [1], 207883 [2]
Reviewed by: feld (mentor)
Approved by: feld (mentor)
Differential Revision: D5751
Notes
Notes:
svn path=/head/; revision=412011
Diffstat (limited to 'databases/mariadb101-server/files/patch-sql_sys__vars.cc')
| -rw-r--r-- | databases/mariadb101-server/files/patch-sql_sys__vars.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/mariadb101-server/files/patch-sql_sys__vars.cc b/databases/mariadb101-server/files/patch-sql_sys__vars.cc index 4f99a9c96e83..f34ba95f612e 100644 --- a/databases/mariadb101-server/files/patch-sql_sys__vars.cc +++ b/databases/mariadb101-server/files/patch-sql_sys__vars.cc @@ -1,8 +1,8 @@ Fix clang build error ---- sql/sys_vars.cc.orig 2015-10-15 15:43:47 UTC +--- sql/sys_vars.cc.orig 2016-03-24 09:12:12 UTC +++ sql/sys_vars.cc -@@ -1040,7 +1040,7 @@ static Sys_var_ulong Sys_interactive_tim +@@ -1052,7 +1052,7 @@ static Sys_var_ulong Sys_interactive_tim "connection before closing it", NO_SET_STMT SESSION_VAR(net_interactive_timeout), CMD_LINE(REQUIRED_ARG), @@ -11,7 +11,7 @@ Fix clang build error static Sys_var_ulonglong Sys_join_buffer_size( "join_buffer_size", -@@ -2214,7 +2214,7 @@ static Sys_var_ulong Sys_net_read_timeou +@@ -2239,7 +2239,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), @@ -20,7 +20,7 @@ Fix clang build error NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_read_timeout)); -@@ -2229,7 +2229,7 @@ static Sys_var_ulong Sys_net_write_timeo +@@ -2254,7 +2254,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), @@ -29,7 +29,7 @@ Fix clang build error NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_net_write_timeout)); -@@ -3424,7 +3424,7 @@ static Sys_var_ulong Sys_net_wait_timeou +@@ -3449,7 +3449,7 @@ static Sys_var_ulong Sys_net_wait_timeou "The number of seconds the server waits for activity on a " "connection before closing it", NO_SET_STMT SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), |