1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

small mtr cleanup

and move the connect suite into storage/connect/
This commit is contained in:
Sergei Golubchik
2013-04-19 07:07:06 +02:00
parent 3975256685
commit 53375573e3
60 changed files with 24 additions and 23 deletions

View File

@ -1925,7 +1925,7 @@ sub collect_mysqld_features {
# here we want to detect all not mandatory plugins
# they are listed in the --help output as
# --archive[=name] Enable or disable ARCHIVE plugin. Possible values are ON, OFF, FORCE (don't start if the plugin fails to load).
push @optional_plugins, "plugin-$1"
push @optional_plugins, $1
if /^ --([-a-z0-9]+)\[=name\] +Enable or disable \w+ plugin. Possible values are ON, OFF, FORCE/;
next;
}
@ -3450,7 +3450,7 @@ sub mysql_install_db {
mtr_add_arg($args, "--basedir=%s", $install_basedir);
mtr_add_arg($args, "--datadir=%s", $install_datadir);
mtr_add_arg($args, "--default-storage-engine=myisam");
mtr_add_arg($args, "--skip-$_") for @optional_plugins;
mtr_add_arg($args, "--skip-plugin-$_") for @optional_plugins;
# starting from 10.0 bootstrap scripts require InnoDB
mtr_add_arg($args, "--loose-innodb");
mtr_add_arg($args, "--disable-sync-frm");