Commit 0b7a79c6 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

Revert "mtr: remove --binary from patch args"

This reverts commit 1749a689.

The reason why we need --binary for patch is because of a bug in
patch.exe 2.5.9. We need to supply binary otherwise the patch program
crashes.
parent 613bc18a
...@@ -3385,7 +3385,7 @@ sub do_before_run_mysqltest($) ...@@ -3385,7 +3385,7 @@ sub do_before_run_mysqltest($)
# to be able to distinguish them from manually created # to be able to distinguish them from manually created
# version-controlled results, and to ignore them in git. # version-controlled results, and to ignore them in git.
my $dest = "$base_file$suites.result~"; my $dest = "$base_file$suites.result~";
my @cmd = ($exe_patch, qw/-r - -f -s -o/, my @cmd = ($exe_patch, qw/--binary -r - -f -s -o/,
$dest, $base_result, $resfile); $dest, $base_result, $resfile);
if (-w $resdir) { if (-w $resdir) {
# don't rebuild a file if it's up to date # don't rebuild a file if it's up to date
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment