From 3fd79a04b69af46eddcdef947bef07b4c139ac75 Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Tue, 1 Mar 2022 11:46:57 +0200
Subject: MMDEV-27823 mariadb-install-db --group fails

Fixed by not sending --group option to the server (for now)

Reviwer: Sergei Golubchik
---
 scripts/mysql_install_db.sh | 9 +++++----
 scripts/mysqld_safe.sh      | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts')

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"
-- 
cgit v1.2.1