database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Vlad Lesin
2022-03-07 18:42:47 +03:00
parent b6a2472489 0b92c7b0e0
commit 202316a38f
31 changed files with 275 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mysql_install_db.sh
View File

@@ -513,10 +513,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

@@ -704,6 +704,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"