summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2015-09-16 13:01:04 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2015-09-16 13:14:19 +0300
commit173e48695031ef17c69957751539060a0df1d6c7 (patch)
treeed1cb54c679ca425107aa4a2aa3245f6fe827f0d /scripts/mysql_install_db.sh
parentbb52905432779d1648241baa5945c61617f2d58f (diff)
downloadmariadb-git-173e48695031ef17c69957751539060a0df1d6c7.tar.gz
MDEV-8576: Bootstrap should ignore --enforce-storage-engine option
Allow enforce-storage-engine="" option and use that on mysql_install_db when doing bootstrap.
Diffstat (limited to 'scripts/mysql_install_db.sh')
-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 15750ff5e90..967e7648f0c 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -417,7 +417,7 @@ mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
mysqld_install_cmd_line()
{
"$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \
- "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 \
+ "--basedir=$basedir" "--datadir=$ldata" --log-warnings=0 --enforce-storage-engine="" \
$args --max_allowed_packet=8M \
--net_buffer_length=16K
}