database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Use "--skip-innodb" if running with testcases that does not need innodb

Browse Source 
Decreases test time when running a selected number of tests


mysql-test/lib/mtr_cases.pl:
  Remove fixme, it's fiexd now
mysql-test/mysql-test-run.pl:
  Use "--skip-innodb" if running with testcases that does not need innodb
This commit is contained in:
unknown
2006-09-01 10:01:47 +02:00
parent c0966c4fcc
commit edc0e9fba8
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/mysql-test-run.pl
View File

@ -258,6 +258,7 @@ our $opt_result_ext;
our $opt_skip;
our $opt_skip_rpl;
our $use_slaves;
our $use_innodb;
our $opt_skip_test;
our $opt_skip_im;
@ -428,6 +429,7 @@ sub main () {
$need_ndbcluster||= $test->{ndb_test};
$need_im||= $test->{component_id} eq 'im';
$use_slaves||= $test->{slave_num};
$use_innodb||= $test->{'innodb_test'};
}
$opt_skip_ndbcluster= $opt_skip_ndbcluster_slave= 1
unless $need_ndbcluster;
@ -2236,8 +2238,9 @@ sub initialize_servers () {
sub mysql_install_db () {
# FIXME not exactly true I think, needs improvements
install_db('master', $master->[0]->{'path_myddir'});
# FIXME check if testcase really is using second master
copy_install_db('master', $master->[1]->{'path_myddir'});
if ( $use_slaves )
@ -2252,10 +2255,8 @@ sub mysql_install_db () {
im_prepare_env($instance_manager);
}
my $cluster_started_ok= 1; # Assume it can be started
if (ndbcluster_start_install($clusters->[0]) ||
$use_slaves && ndbcluster_start_install($clusters->[1]))
{
@ -2263,7 +2264,6 @@ sub mysql_install_db () {
$cluster_started_ok= 0;
}
foreach my $cluster (@{$clusters})
{
@ -2903,7 +2903,7 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--datadir=%s", $prefix,
$master->[$idx]->{'path_myddir'});
if ( $idx > 0 )
if ( $idx > 0 or !$use_innodb)
{
mtr_add_arg($args, "%s--skip-innodb", $prefix);
}