diff options
| author | unknown <monty@mysql.com> | 2004-02-04 00:28:58 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-04 00:28:58 +0100 |
| commit | 796a040d5c4384a2aba3c2fec715e26f9087d1c1 (patch) | |
| tree | b8735221e5943c25d6c896413c88923887cf85bf /sql | |
| parent | 313761cb40d7ba89c860e0c823f20f59698dab4c (diff) | |
| download | mariadb-git-796a040d5c4384a2aba3c2fec715e26f9087d1c1.tar.gz | |
Ensure that wait_timeout doesn't overflow on windows. (Bug #2400)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b2b53e571c3..c3931eccc0c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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", (gptr*) &global_system_variables.net_wait_timeout, (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, "The default week format used by WEEK() functions.", (gptr*) &global_system_variables.default_week_format, |