database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Small documentation change

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2002-05-28 10:39:47 +03:00
parent c6b21b93dd
commit e814ca4108
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Docs/manual.texi
View File

@ -14340,7 +14340,8 @@ privilege.
@item --skip-stack-trace @item --skip-stack-trace
Don't write stack traces. This option is useful when you are running Don't write stack traces. This option is useful when you are running
@code{mysqld} under a debugger. @xref{Debugging server}. @code{mysqld} under a debugger. On some system you also have to use
this option to get a core file. @xref{Debugging server}.
@item --skip-thread-priority @item --skip-thread-priority
Disable using thread priorities for faster response time. Disable using thread priorities for faster response time.
@ -19981,7 +19982,7 @@ is automatically enlarged, up to @code{max_allowed_packet} bytes.)
@item @code{net_read_timeout} @item @code{net_read_timeout}
Number of seconds to wait for more data from a connection before aborting Number of seconds to wait for more data from a connection before aborting
the read. Note that when we don't expect data from a connection, the timeout the read. Note that when we don't expect data from a connection, the timeout
is defined by @code{write_timeout}. See also @code{slave_read_timeout}. is defined by @code{write_timeout}. See also @code{slave_net_timeout}.
@item @code{net_retry_count} @item @code{net_retry_count}
If a read on a communication port is interrupted, retry this many times If a read on a communication port is interrupted, retry this many times
@ -20060,7 +20061,7 @@ the @strong{process} privilege. This can improve security if you're
concerned about people being able to see what databases other users concerned about people being able to see what databases other users
have. See also @code{safe_show_database}. have. See also @code{safe_show_database}.
@item @code{slave_read_timeout} @item @code{slave_net_timeout}
Number of seconds to wait for more data from a master/slave connection Number of seconds to wait for more data from a master/slave connection
before aborting the read. before aborting the read.
@ -24057,7 +24058,7 @@ Example:
Tells the slave server not to start the slave on the startup. The user Tells the slave server not to start the slave on the startup. The user
can start it later with @code{SLAVE START}. can start it later with @code{SLAVE START}.
@item @code{slave_read_timeout=#} @tab @item @code{slave_net_timeout=#} @tab
Number of seconds to wait for more data from the master before aborting Number of seconds to wait for more data from the master before aborting
the read. the read.
@end multitable @end multitable

3
sql/mysqld.cc
View File

@ -3501,7 +3501,8 @@ static struct my_option my_long_options[] =
(gptr*) &relay_log_space_limit, 0, GET_ULONG, REQUIRED_ARG, 0L, 0L, (gptr*) &relay_log_space_limit, 0, GET_ULONG, REQUIRED_ARG, 0L, 0L,
ULONG_MAX, 0, 1, 0}, ULONG_MAX, 0, 1, 0},
{"slave_net_timeout", OPT_SLAVE_NET_TIMEOUT, {"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}, GET_ULONG, REQUIRED_ARG, SLAVE_NET_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0},
{"slow_launch_time", OPT_SLOW_LAUNCH_TIME, {"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.", "If creating the thread takes longer than this value (in seconds), the Slow_launch_threads counter will be incremented.",