diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-07 09:05:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-07 09:05:36 +0200 |
| commit | 7b97020d402ae96b1da84396c172bdfdc1bccb37 (patch) | |
| tree | 6d5d2d3d74c6c5a9db9f6a6218357a070678e3b2 /scripts | |
| parent | 5172f132bfc925009ec24f175c8d050d0329e3e5 (diff) | |
| parent | 02da00a98ceb8f82a65ed72a74b53b6d5ae3d144 (diff) | |
| download | mariadb-git-7b97020d402ae96b1da84396c172bdfdc1bccb37.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 9 | ||||
| -rw-r--r-- | scripts/mysqld_safe.sh | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 4e61c1016ad..ef8b2414805 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -512,10 +512,11 @@ then args="$args --user=$user" fi -if test -n "$group" -then - args="$args --group=$group" -fi +#To be enabled if/when we enable --group as an option to mysqld +#if test -n "$group" +#then +# args="$args --group=$group" +#fi if test -f "$ldata/mysql/user.frm" then diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 59b487fac13..f37d83d93f4 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -703,6 +703,7 @@ then if test "$user" != "root" -o $SET_USER = 1 then USER_OPTION="--user=$user" + # To be used if/when we enable --system-group as an option to mysqld GROUP_OPTION="--group=$group" fi if test -n "$open_files" |