Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MDEV-33618: add mariadbd_safe to option groups #3130

Open
wants to merge 1 commit into
base: 11.5
Choose a base branch
from
Open

MDEV-33618: add mariadbd_safe to option groups #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions man/mariadbd-safe.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ Options unknown to
are passed to
\fBmysqld\fR
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\&.
.PP
\fBmysqld_safe\fR
reads all options from the
[mysqld],
[server],
[mysqld_safe], and [mariadb_safe]
[mysqld_safe], [mariadbd-safe] and [mariadbd_safe]
sections in option files\&. For example, if you specify a
[mysqld]
section like this,
Expand Down
2 changes: 1 addition & 1 deletion scripts/mysqld_safe.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ fi
# If arguments come from [mysqld_safe] section of my.cnf
# we complain about unrecognized options
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
# handle them here. So, we collect unrecognized options (passed on
Expand Down