diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-05 13:31:38 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-05 13:31:38 +0100 |
| commit | 4d8b228c8dd9ac6da7e895373bf029826d754279 (patch) | |
| tree | 54eb50627eeea08db264f66497218a9e69225986 /mysql-test/mysql-test-run.pl | |
| parent | 6644ff11c5036f79969c009619590ef4bbde0292 (diff) | |
| download | mariadb-git-4d8b228c8dd9ac6da7e895373bf029826d754279.tar.gz | |
Bug #49166 mtr --combination is broken after restrictions of combination names
Combinations beginning with -- not allowed
Allow them...
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7d2426459d0..27c2ace56b2 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3251,9 +3251,11 @@ sub run_testcase ($) { mtr_verbose("Running test:", $tinfo->{name}); - # Allow only alpanumerics pluss _ - + . in combination names + # Allow only alpanumerics pluss _ - + . in combination names, + # or anything beginning with -- (the latter comes from --combination) my $combination= $tinfo->{combination}; - if ($combination && $combination !~ /^\w[-\w\.\+]+$/) + if ($combination && $combination !~ /^\w[-\w\.\+]+$/ + && $combination !~ /^--/) { mtr_error("Combination '$combination' contains illegal characters"); } |