From e1822696f3e93a27ffdc0cdb1b819500c2ef67ab Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Thu, 4 May 2017 09:33:18 +0000 Subject: databases/mariadb55-server: Update to 5.5.56 - Bugfix update to 5.5.56 - Re-roll patches - Convert patches to new naming convention - Add/move ldconfig config to -server - Move client option to -client port --- .../mariadb55-server/files/patch-sql_sys_vars.cc | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 databases/mariadb55-server/files/patch-sql_sys_vars.cc (limited to 'databases/mariadb55-server/files/patch-sql_sys_vars.cc') diff --git a/databases/mariadb55-server/files/patch-sql_sys_vars.cc b/databases/mariadb55-server/files/patch-sql_sys_vars.cc deleted file mode 100644 index e8f0caff4aff..000000000000 --- a/databases/mariadb55-server/files/patch-sql_sys_vars.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 @@ - "connection before closing it", - SESSION_VAR(net_interactive_timeout), - CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - static Sys_var_ulong Sys_join_buffer_size( - "join_buffer_size", -@@ -1401,7 +1401,7 @@ - "Number of seconds to wait for more data from a connection before " - "aborting the read", - SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_read_timeout)); - -@@ -1416,7 +1416,7 @@ - "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), -- VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), -+ VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1), - NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), - ON_UPDATE(fix_net_write_timeout)); - -@@ -2257,7 +2257,7 @@ - "The number of seconds the server waits for activity on a " - "connection before closing it", - SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG), -- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)), -+ VALID_RANGE(1, INT_MAX32/1000), - DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1)); - - /** propagates changes to the relevant flag of @@optimizer_switch */ -- cgit v1.2.3