Commit 796a040d authored by unknown's avatar unknown

Ensure that wait_timeout doesn't overflow on windows. (Bug #2400)

parent 313761cb
...@@ -4093,7 +4093,8 @@ this value; if zero (the default): when the size exceeds max_binlog_size. \ ...@@ -4093,7 +4093,8 @@ this value; if zero (the default): when the size exceeds max_binlog_size. \
"The number of seconds the server waits for activity on a connection before closing it", "The number of seconds the server waits for activity on a connection before closing it",
(gptr*) &global_system_variables.net_wait_timeout, (gptr*) &global_system_variables.net_wait_timeout,
(gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG, (gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,
REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0}, REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),
0, 1, 0},
{ "default-week-format", OPT_DEFAULT_WEEK_FORMAT, { "default-week-format", OPT_DEFAULT_WEEK_FORMAT,
"The default week format used by WEEK() functions.", "The default week format used by WEEK() functions.",
(gptr*) &global_system_variables.default_week_format, (gptr*) &global_system_variables.default_week_format,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment