diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2010-02-28 19:47:16 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2010-02-28 19:47:16 +0200 |
| commit | 82fe344cbe909c7526bb87af8dc78586341154a1 (patch) | |
| tree | 81f6d95c01a7436d1fa9b7936c3e4135083eab67 /sql/sys_vars.cc | |
| parent | 88f4990c3333a720b09e43c095bb4257332177c4 (diff) | |
| parent | 055c61049e32572464495ef23d0cdf158e083dda (diff) | |
| download | mariadb-git-82fe344cbe909c7526bb87af8dc78586341154a1.tar.gz | |
merging to 6.0-codebase-bugfixing from a local branch
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index ba970925fc6..1d3ef17c5a1 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2799,7 +2799,7 @@ static Sys_var_ulong Sys_slave_net_timeout( "slave_net_timeout", "Number of seconds to wait for more data " "from a master/slave connection before aborting the read", GLOBAL_VAR(slave_net_timeout), CMD_LINE(REQUIRED_ARG), - VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(SLAVE_NET_TIMEOUT), BLOCK_SIZE(1), + VALID_RANGE(1, UINT_MAX), DEFAULT(SLAVE_NET_TIMEOUT), BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_slave_net_timeout)); |