diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 17:48:36 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-19 17:48:36 +0100 |
| commit | 7f19330c595e3183d079fe2c18eecc74740e8f83 (patch) | |
| tree | 8b853976cd14d96d5415757be525133b32be0c93 /mysql-test/lib | |
| parent | 4046ed12bcddfd831c510b022cb7af224be9457b (diff) | |
| parent | f4421c893b50f05078f14d33c47d21f52f59f8a7 (diff) | |
| download | mariadb-git-7f19330c595e3183d079fe2c18eecc74740e8f83.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_cases.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm index 60535a2009b..0537c9623fc 100644 --- a/mysql-test/lib/mtr_cases.pm +++ b/mysql-test/lib/mtr_cases.pm @@ -319,7 +319,7 @@ sub parse_disabled { chomp; next if /^\s*#/ or /^\s*$/; mtr_error("Syntax error in $filename line $.") - unless /^\s*(?:([-0-9A-Za-z_\/]+)\.)?([-0-9A-Za-z_]+)\s*:\s*(.*?)\s*$/; + unless /^\s*(?:([-0-9A-Za-z_\/]+)\.)?([-0-9A-Za-z_#]+)\s*:\s*(.*?)\s*$/; mtr_error("Wrong suite name in $filename line $.") if defined $1 and defined $suitename and $1 ne $suitename; $disabled{($1 || $suitename || '') . ".$2"} = $3; |