Commit 0dfc9ece authored by Andre Alves's avatar Andre Alves Committed by Andrew Hutchings

MDEV-33618: add mariadbd_safe to option groups

parent c96b23f9
...@@ -51,14 +51,14 @@ Options unknown to ...@@ -51,14 +51,14 @@ 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] or [mariadb_safe] [mysqld_safe], [mariadbd-safe] or [mariadbd_safe]
groups of an option file\&. groups of an option file\&.
.PP .PP
\fBmysqld_safe\fR \fBmysqld_safe\fR
reads all options from the reads all options from the
[mysqld], [mysqld],
[server], [server],
[mysqld_safe], and [mariadb_safe] [mysqld_safe], [mariadbd-safe] and [mariadbd_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,
......
...@@ -595,7 +595,7 @@ fi ...@@ -595,7 +595,7 @@ fi
# If arguments come from [mysqld_safe] section of my.cnf # If arguments come from [mysqld_safe] section of my.cnf
# we complain about unrecognized options # we complain about unrecognized options
unrecognized_handling=complain unrecognized_handling=complain
parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe mariadbd-safe` parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe mariadbd_safe mariadbd-safe`
# We only need to pass arguments through to the server if we don't # We only need to pass arguments through to the server if we don't
# handle them here. So, we collect unrecognized options (passed on # handle them here. So, we collect unrecognized options (passed on
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment