diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-09 08:06:59 +0100 |
commit | 4933d21e5d93840ddcf41bf25ed92fbe253ae92d (patch) | |
tree | a4d892b86aa46927978f82976fff61f1e5193383 /mysql-test/mysql-test-run.pl | |
parent | 97ee59d27d3daca806fdb3577df5a0e0a45a0a30 (diff) | |
parent | 7009bf411a8cb9a6e035b761b5e6352b4f474303 (diff) | |
download | mariadb-git-4933d21e5d93840ddcf41bf25ed92fbe253ae92d.tar.gz |
merge with mysql-5.5.21
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b2895f82beb..a22271bb15f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3665,7 +3665,7 @@ sub do_before_run_mysqltest($) # Remove old files produced by mysqltest die "unsupported result file name $resfile, stoping" unless - $resfile =~ /^(.*?)((?:,\w+)*)\.(rdiff|result)$/; + $resfile =~ /^(.*?)((?:,\w+)*)\.(rdiff|result|result~)$/; my ($base_file, $suites, $ext)= ($1, $2, $3); # if the result file is a diff, make a proper result file if ($ext eq 'rdiff') { |