diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-09 12:27:54 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-09 12:27:54 +0200 |
commit | 27eaa963ff18d12939f798a78720d73cf6ce0b5d (patch) | |
tree | 0bca93e0e81c308a3497b7ff59b97d03202cb863 /man | |
parent | 320de65135c6dd1af7c2f34ac0469b80aaf3ddb6 (diff) | |
parent | e56c12b3cdf57ad29cee0ffe33bd6bc44c963789 (diff) | |
download | mariadb-git-27eaa963ff18d12939f798a78720d73cf6ce0b5d.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'man')
-rw-r--r-- | man/mysqld_safe.1 | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/man/mysqld_safe.1 b/man/mysqld_safe.1 index 48be990964d..7be1d36fe55 100644 --- a/man/mysqld_safe.1 +++ b/man/mysqld_safe.1 @@ -340,7 +340,9 @@ program to set the server\'s scheduling priority to the given value\&. .\} .\" mysqld_safe: no-auto-restart option .\" no-auto-restart option: mysqld_safe -\fB\-\-no\-auto\-restart\fR +\fB\-\-no\-auto\-restart\fR, +\fB\-\-nowatch\fR, +\fB\-\-no\-watch\fR .sp Exit after starting mysqld\&. .RE @@ -368,21 +370,6 @@ Do not read any option files\&. This must be the first option on the command lin .sp -1 .IP \(bu 2.3 .\} -.\" mysqld_safe: no-watch option -.\" no-watch option: mysqld_safe -\fB\-\-no\-auto\-restart\fR -.sp -Exit after starting mysqld\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} .\" mysqld_safe: numa-interleave option .\" numa-interleave option: mysqld_safe \fB\-\-numa\-interleave\fR |