diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-16 13:01:04 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2015-09-16 13:14:19 +0300 |
| commit | 173e48695031ef17c69957751539060a0df1d6c7 (patch) | |
| tree | ed1cb54c679ca425107aa4a2aa3245f6fe827f0d | |
| parent | bb52905432779d1648241baa5945c61617f2d58f (diff) | |
| download | mariadb-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.
| -rw-r--r-- | scripts/mysql_install_db.pl.in | 1 | ||||
| -rw-r--r-- | scripts/mysql_install_db.sh | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in index 8a3492c8756..d1c4aaa1906 100644 --- a/scripts/mysql_install_db.pl.in +++ b/scripts/mysql_install_db.pl.in @@ -428,6 +428,7 @@ my $mysqld_install_cmd_line = quote_options($mysqld_bootstrap, "--max_allowed_packet=8M", "--default-storage-engine=MyISAM", "--net_buffer_length=16K", + "--enforce-storage-engine=\"\"", @args, ); 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 } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b45d4e10b61..8e11b4b6caf 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5293,6 +5293,9 @@ static int init_server_components() if (default_tmp_storage_engine && !*default_tmp_storage_engine) 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)) unireg_abort(1); |