database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2022-03-07 09:05:36 +02:00
parent 5172f132bf 02da00a98c
commit 7b97020d40
15 changed files with 121 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mysql_install_db.sh
View File

@ -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

1
scripts/mysqld_safe.sh
View File

@ -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"