diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-15 11:00:02 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-06-15 11:00:02 +0200 |
| commit | 8d253fe2f8ee8cbb3bd9f0cba1116567a9721022 (patch) | |
| tree | 29e76debfc6a12cff1b8ca24fdc07c0c0c97d0f8 /mysql-test | |
| parent | b18902fd59596bfc0b0a0417953bbd312be8bcaa (diff) | |
| download | mariadb-git-8d253fe2f8ee8cbb3bd9f0cba1116567a9721022.tar.gz | |
Bug #53424 Certain combination of flags give internal error
Reorder code breaks when finding tests skipped due to --skip-rpl etc.
Add simple test that master_opt is non-empty
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index b9943fb6cfa..b3b7adf1b9e 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -246,8 +246,10 @@ sub collect_test_cases ($) { push(@criteria, "ndb=" . ($tinfo->{'ndb_test'} ? "1" : "0")); # Group test with equal options together. # Ending with "~" makes empty sort later than filled - push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~"); - + if ( $tinfo->{'master_opt'}[0] ) + { + push(@criteria, join("!", sort @{$tinfo->{'master_opt'}}) . "~"); + } $sort_criteria{$test_name} = join(" ", @criteria); } } |