summaryrefslogtreecommitdiff
path: root/databases/mariadb102-server/files/patch-sql_sys__vars.cc
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mariadb102-server/files/patch-sql_sys__vars.cc')
-rw-r--r--databases/mariadb102-server/files/patch-sql_sys__vars.cc40
1 files changed, 0 insertions, 40 deletions
diff --git a/databases/mariadb102-server/files/patch-sql_sys__vars.cc b/databases/mariadb102-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 5d9f14d03828..000000000000
--- a/databases/mariadb102-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-Fix clang build error
-
---- sql/sys_vars.cc.orig 2017-05-14 23:13:18 UTC
-+++ sql/sys_vars.cc
-@@ -1067,7 +1067,7 @@ static Sys_var_ulong Sys_interactive_tim
- "connection before closing it",
- NO_SET_STMT 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_ulonglong Sys_join_buffer_size(
- "join_buffer_size",
-@@ -2242,7 +2242,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),
-- 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));
-
-@@ -2257,7 +2257,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),
-- 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));
-
-@@ -3505,7 +3505,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),
-- VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+ VALID_RANGE(1, INT_MAX32/1000),
- DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-
- static Sys_var_plugin Sys_default_storage_engine(