database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code 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
parent 4046ed12bc f4421c893b
commit 7f19330c59
168 changed files with 4352 additions and 491 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;