1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4979 mysqld_safe section in my.cnf doesn't have mariadb equivalent

Browse Source 
read also [mariadb_safe] section.
modify the manpage accordingly (and remove a netware-specific option from it)
This commit is contained in:
Sergei Golubchik 2013-09-19 22:24:39 +02:00
parent 93b7d00f00
commit 6e52631065
2 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
man/mysqld_safe.1
View File

@ -83,15 +83,15 @@ Options unknown to
are passed to are passed to
\fBmysqld\fR \fBmysqld\fR
if they are specified on the command line, but ignored if they are specified in the if they are specified on the command line, but ignored if they are specified in the
[mysqld_safe] [mysqld_safe] or [mariadb_safe]
group of an option file\&. See groups of an option file\&. See
Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&. Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
.PP .PP
\fBmysqld_safe\fR \fBmysqld_safe\fR
reads all options from the reads all options from the
[mysqld], [mysqld],
[server], and [server],
[mysqld_safe] [mysqld_safe], and [mariadb_safe]
sections in option files\&. For example, if you specify a sections in option files\&. For example, if you specify a
[mysqld] [mysqld]
section like this, section like this,
@ -146,40 +146,6 @@ Display a help message and exit\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
.\" mysqld_safe: autoclose option
.\" autoclose option: mysqld_safe
\fB\-\-autoclose\fR
.sp
(NetWare only) On NetWare,
\fBmysqld_safe\fR
provides a screen presence\&. When you unload (shut down) the
\fBmysqld_safe\fR
NLM, the screen does not by default go away\&. Instead, it prompts for user input:
.sp
.if n \{\
.RS 4
.\}
.nf
*<NLM has terminated; Press any key to close the screen>*
.fi
.if n \{\
.RE
.\}
.sp
If you want NetWare to close the screen automatically instead, use the
\fB\-\-autoclose\fR
option to
\fBmysqld_safe\fR\&.
.RE
.sp
.RS 4
.ie n \{\
\h'-04'\(bu\h'+03'\c
.\}
.el \{\
.sp -1
.IP \(bu 2.3
.\}
.\" mysqld_safe: basedir option .\" mysqld_safe: basedir option
.\" basedir option: mysqld_safe .\" basedir option: mysqld_safe
\fB\-\-basedir=\fR\fB\fIpath\fR\fR \fB\-\-basedir=\fR\fB\fIpath\fR\fR

2
scripts/mysqld_safe.sh
View File

@ -509,7 +509,7 @@ then
SET_USER=0 SET_USER=0
fi fi
parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld` parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe`
parse_arguments PICK-ARGS-FROM-ARGV "$@" parse_arguments PICK-ARGS-FROM-ARGV "$@"