1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Save "master_opt" in master so it can be checked later to see if it's the same as the test that are about to run uses the same.

mysql-test/lib/mtr_cases.pl:
  Move setting of --skip-innodb out of recursive loop
This commit is contained in:
unknown
2006-05-18 19:52:43 +02:00
parent c295bd8082
commit 20091c5b86
2 changed files with 17 additions and 7 deletions

View File

@ -458,6 +458,12 @@ sub collect_one_test_case($$$$$$$) {
else
{
mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");
if ( ! $tinfo->{'innodb_test'} )
{
# mtr_report("Adding '--skip-innodb' to $tinfo->{'name'}");
push(@{$tinfo->{'master_opt'}}, "--skip-innodb");
}
}
# We can't restart a running server that may be in use
@ -500,13 +506,6 @@ sub mtr_options_from_test_file($$$) {
}
close FILE;
if ( ! $tinfo->{'innodb_test'} )
{
# mtr_report("Adding '--skip-innodb' to $tinfo->{'name'}");
push(@{$tinfo->{'master_opt'}}, "--skip-innodb");
}
}
1;