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

Bug #49166 mtr --combination is broken after restrictions of combination names

Browse Source 
Combinations beginning with -- not allowed
Allow them...
This commit is contained in:
Bjorn Munch
2010-01-05 13:05:00 +01:00
parent 50ab925e04
commit 04c39b1939
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3251,9 +3251,11 @@ sub run_testcase ($) {
mtr_verbose("Running test:", $tinfo->{name}); 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}; my $combination= $tinfo->{combination};
if ($combination && $combination !~ /^\w[-\w\.\+]+$/) if ($combination && $combination !~ /^\w[-\w\.\+]+$/
&& $combination !~ /^--/)
{ {
mtr_error("Combination '$combination' contains illegal characters"); mtr_error("Combination '$combination' contains illegal characters");
} }