diff options
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 46938ea7cde..4ed1686a121 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1345,10 +1345,13 @@ sub collect_mysqld_features () { my $found_variable_list_start= 0; # - # Execute "mysqld --no-defaults --help --verbose" to get a + # Execute "mysqld --help --verbose" to get a list # list of all features and settings # - my $list= `$exe_mysqld --no-defaults --verbose --help`; + # --no-defaults and --skip-grant-tables are to avoid loading + # system-wide configs and plugins + # + my $list= `$exe_mysqld --no-defaults --skip-grant-tables --verbose --help`; foreach my $line (split('\n', $list)) { @@ -2975,8 +2978,8 @@ sub install_db ($$) { mtr_add_arg($args, "--bootstrap"); mtr_add_arg($args, "--basedir=%s", $path_my_basedir); mtr_add_arg($args, "--datadir=%s", $data_dir); - mtr_add_arg($args, "--skip-innodb"); - mtr_add_arg($args, "--skip-ndbcluster"); + mtr_add_arg($args, "--loose-skip-innodb"); + mtr_add_arg($args, "--loose-skip-ndbcluster"); mtr_add_arg($args, "--tmpdir=."); mtr_add_arg($args, "--core-file"); @@ -3117,8 +3120,8 @@ basedir = $path_my_basedir server_id = $server_id shutdown-delay = 10 skip-stack-trace -skip-innodb -skip-ndbcluster +loose-skip-innodb +loose-skip-ndbcluster EOF ; if ( $mysql_version_id < 50100 ) @@ -3788,7 +3791,7 @@ sub mysqld_arguments ($$$$) { if ( $opt_skip_ndbcluster || !$cluster->{'pid'}) { - mtr_add_arg($args, "%s--skip-ndbcluster", $prefix); + mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix); } else { @@ -3862,7 +3865,7 @@ sub mysqld_arguments ($$$$) { $mysqld->{'cluster'} == -1 || !$clusters->[$mysqld->{'cluster'}]->{'pid'} ) { - mtr_add_arg($args, "%s--skip-ndbcluster", $prefix); + mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix); } else { |