mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'github/10.0-galera' into 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2015-11-19 17:48:36 +01:00
commit 7f19330c59
168 changed files with 4353 additions and 492 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/lib/mtr_cases.pm
View file

@ -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;