diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-04 14:29:36 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-03-04 14:29:36 +0200 |
| commit | 02da00a98ceb8f82a65ed72a74b53b6d5ae3d144 (patch) | |
| tree | 22d8225a0de58854ed2998a70843898a5d48c76d /scripts | |
| parent | 3c06a0b7dc121eb606f1d56d0509326e4e7d52b4 (diff) | |
| parent | a92f07f4bd450f7368a998ce63443dd66374262a (diff) | |
| download | mariadb-git-02da00a98ceb8f82a65ed72a74b53b6d5ae3d144.tar.gz | |
Merge 10.2 into 10.3
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 ee15cd6cb28..8a0da9811b5 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -483,10 +483,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 # When doing a "cross bootstrap" install, no reference to the current # host should be added to the system tables. So we filter out any diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 152077fe2a0..f92a31851ff 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -694,6 +694,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" |