summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-11-08 17:01:28 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-11-08 17:01:28 +0200
commita732d5e2ba3d63a08e20670535d4cd29f667daf0 (patch)
tree692f6d95ded214a3cbf1e259f4f58dac67d37eea /man
parentfe330b63fe4ee51a26ac6e222d8eb4ee44a73d50 (diff)
parent8fb176c3c1c71516f0562399d055e92686519588 (diff)
downloadmariadb-git-a732d5e2ba3d63a08e20670535d4cd29f667daf0.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'man')
-rw-r--r--man/mysqld_safe.119
1 files changed, 3 insertions, 16 deletions
diff --git a/man/mysqld_safe.1 b/man/mysqld_safe.1
index a995d61dca1..06e3dbdee0b 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