summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-03-29 09:53:15 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-03-29 09:53:15 +0300
commit020e7d89ebdcded3355c82cec93e0abef2898258 (patch)
tree4e25a2d8826cbe0ddac7ae564fe1c28b220f9925 /scripts
parent739002eec90efa73a3b77db1cc46b313e8ac1bfd (diff)
parent303448bc912486f4766129cc407a5077a3ca4359 (diff)
downloadmariadb-git-020e7d89ebdcded3355c82cec93e0abef2898258.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 8a0da9811b5..4c6376142cc 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -505,7 +505,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
}