summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2022-03-01 11:46:57 +0200
committerMonty <monty@mariadb.org>2022-03-01 12:54:47 +0200
commit3fd79a04b69af46eddcdef947bef07b4c139ac75 (patch)
tree44fabdebeb7cdf08c48abdbfb768e0e4668b7b91
parent1c74d1bcacee9d05999c7e3230ae5b6d7c03d440 (diff)
downloadmariadb-git-3fd79a04b69af46eddcdef947bef07b4c139ac75.tar.gz
MMDEV-27823 mariadb-install-db --group fails
Fixed by not sending --group option to the server (for now) Reviwer: Sergei Golubchik
-rw-r--r--scripts/mysql_install_db.sh9
-rw-r--r--scripts/mysqld_safe.sh1
2 files changed, 6 insertions, 4 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 63c014ea098..3df48f0eb95 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -484,10 +484,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 29b6d839685..5574587da6b 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -722,6 +722,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"