1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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

This reverts commit 1749a68968.

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.
This commit is contained in:
Vicențiu Ciorbaru
2020-04-13 16:25:32 +03:00
parent 613bc18a36
commit 0b7a79c6b0

View File

@ -3385,7 +3385,7 @@ 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/-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