Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "mtr: remove --binary from patch args"
This reverts commit 1749a68.

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.
  • Loading branch information
cvicentiu committed Apr 13, 2020
1 parent 613bc18 commit 0b7a79c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mysql-test/mysql-test-run.pl
Expand Up @@ -3385,7 +3385,7 @@ ($)
# 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/-r - -f -s -o/,
my @cmd = ($exe_patch, qw/--binary -r - -f -s -o/,
$dest, $base_result, $resfile);
if (-w $resdir) {
# don't rebuild a file if it's up to date
Expand Down

0 comments on commit 0b7a79c

Please sign in to comment.