Commit 173e4869 authored by Jan Lindström's avatar Jan Lindström

MDEV-8576: Bootstrap should ignore --enforce-storage-engine option

Allow enforce-storage-engine="" option and use that on mysql_install_db
when doing bootstrap.
parent bb529054
...@@ -428,6 +428,7 @@ my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap, ...@@ -428,6 +428,7 @@ my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap,
"--max_allowed_packet=8M", "--max_allowed_packet=8M",
"--default-storage-engine=MyISAM", "--default-storage-engine=MyISAM",
"--net_buffer_length=16K", "--net_buffer_length=16K",
"--enforce-storage-engine=\"\"",
@args, @args,
); );
......
...@@ -417,7 +417,7 @@ mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}" ...@@ -417,7 +417,7 @@ mysqld_bootstrap="${MYSQLD_BOOTSTRAP-$mysqld}"
mysqld_install_cmd_line() mysqld_install_cmd_line()
{ {
"$mysqld_bootstrap" $defaults "$mysqld_opt" --bootstrap \ "$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 \ $args --max_allowed_packet=8M \
--net_buffer_length=16K --net_buffer_length=16K
} }
......
...@@ -5293,6 +5293,9 @@ static int init_server_components() ...@@ -5293,6 +5293,9 @@ static int init_server_components()
if (default_tmp_storage_engine && !*default_tmp_storage_engine) if (default_tmp_storage_engine && !*default_tmp_storage_engine)
default_tmp_storage_engine= NULL; default_tmp_storage_engine= NULL;
if (enforced_storage_engine && !*enforced_storage_engine)
enforced_storage_engine= NULL;
if (init_default_storage_engine(default_tmp_storage_engine, tmp_table_plugin)) if (init_default_storage_engine(default_tmp_storage_engine, tmp_table_plugin))
unireg_abort(1); unireg_abort(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment