summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-04-15 15:05:45 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-04-15 15:05:45 +0300
commit9e43ca8e8c82958f998ac017d7fd33442b72e225 (patch)
tree1d6e213bd8f109d03d913700be1e9f03abb80b36 /mysql-test/mysql-test-run.pl
parentccaec18b3934ee384296b4597bdf462fac66c5a4 (diff)
parentf8166a05af085aeb22be8bc1f41bac9affe4a96f (diff)
downloadmariadb-git-9e43ca8e8c82958f998ac017d7fd33442b72e225.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl7
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 2026f0aefed..0257ed7f8cc 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3581,8 +3581,11 @@ sub do_before_run_mysqltest($)
# to be able to distinguish them from manually created
# version-controlled results, and to ignore them in git.
my $dest = "$base_file$suites.result~";
- my @cmd = ($exe_patch, qw/--binary -r - -f -s -o/,
- $dest, $base_result, $resfile);
+ my @cmd = ($exe_patch);
+ if ($^O eq "MSWin32") {
+ push @cmd, '--binary';
+ }
+ push @cmd, (qw/-r - -f -s -o/, $dest, $base_result, $resfile);
if (-w $resdir) {
# don't rebuild a file if it's up to date
unless (-e $dest and -M $dest < -M $resfile