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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2022-03-04 14:29:36 +02:00
parent 3c06a0b7dc a92f07f4bd
commit 02da00a98c
7 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mysql_install_db.sh
View File

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

1
scripts/mysqld_safe.sh
View File

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