diff options
| author | Dmitry Lenev <dlenev@mysql.com> | 2010-03-01 18:13:57 +0300 |
|---|---|---|
| committer | Dmitry Lenev <dlenev@mysql.com> | 2010-03-01 18:13:57 +0300 |
| commit | 629be0947e94f3307f772f66f4ea4eb002e3fe2a (patch) | |
| tree | b316f73848d41db210082e695b75bedbda3dba6d /sql/sys_vars.cc | |
| parent | 6b5c4a9ef61eff4768c6fdf04857ae8a1b219a6c (diff) | |
| parent | de39f438e39214cb43e0bc2a52c2f210c6218bf8 (diff) | |
| download | mariadb-git-629be0947e94f3307f772f66f4ea4eb002e3fe2a.tar.gz | |
Merge recent changes from mysql-next-mr-bugfixing
into mysql-next-4284 tree.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index ba970925fc6..b7aa4007153 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -2795,11 +2795,11 @@ static bool fix_slave_net_timeout(sys_var *self, THD *thd, enum_var_type type) mysql_mutex_unlock(&LOCK_active_mi); return false; } -static Sys_var_ulong Sys_slave_net_timeout( +static Sys_var_uint 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)); |