diff options
| author | monty@narttu.mysql.fi <> | 2002-05-28 10:42:06 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2002-05-28 10:42:06 +0300 |
| commit | b9e0ee372301f9ba89add952a225f238bace0555 (patch) | |
| tree | ed9ae92789ff779a74a3eef673c98e66d87c0791 /sql | |
| parent | 65039ca99fd6ace8d88e8548402f977b29cec259 (diff) | |
| parent | e814ca4108ba8609d6fb05c057b4e5bed92db67c (diff) | |
| download | mariadb-git-b9e0ee372301f9ba89add952a225f238bace0555.tar.gz | |
Merge hundin:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0
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 2a118be100a..1f70829239c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3501,7 +3501,8 @@ static struct my_option my_long_options[] = (gptr*) &relay_log_space_limit, 0, GET_ULONG, REQUIRED_ARG, 0L, 0L, ULONG_MAX, 0, 1, 0}, {"slave_net_timeout", OPT_SLAVE_NET_TIMEOUT, - "Undocumented", (gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 0, + "Number of seconds to wait for more data from a master/slave connection before aborting the read.", + (gptr*) &slave_net_timeout, (gptr*) &slave_net_timeout, 0, GET_ULONG, REQUIRED_ARG, SLAVE_NET_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0}, {"slow_launch_time", OPT_SLOW_LAUNCH_TIME, "If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented.", |