From: Daniel Black <daniel@mariadb.org>
Date: Thu, 17 Mar 2022 23:44:37 +0000 (+0000)
Subject: Revert upstream e99d3da
X-Git-Tag: archive/raspbian/1%10.6.8-1+rpi1~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=579eccd6eadb68fa8f091d8d4ad346cd5d7d65bb;p=mariadb-10.6.git

Revert upstream e99d3da

Revert upstream https://github.com/MariaDB/server/commit/e99d3da6381023395c86f679bb76b00b4385dc2d
that caused refression in database installation.


Gbp-Pq: Name MDEV-27980-revert-loose-disable-plugin-file-key-management.patch
---

diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index ead30962..20287429 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -541,7 +541,7 @@ mysqld_install_cmd_line()
 {
   "$mysqld_bootstrap" $defaults $defaults_group_suffix "$mysqld_opt" --bootstrap $silent_startup\
   "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --enforce-storage-engine="" \
-  "--plugin-dir=${plugindir}" --loose-disable-plugin-file-key-management \
+  "--plugin-dir=${plugindir}" \
   $args --max_allowed_packet=8M \
   --net_buffer_length=16K
 }