From 0b7a79c6b0d460c522f42f12cc73a1c79ae4e9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= Date: Mon, 13 Apr 2020 16:25:32 +0300 Subject: [PATCH] Revert "mtr: remove --binary from patch args" This reverts commit 1749a68968064278e13b43abfe93aff11e46b9a2. 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. --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 51e0ef1b0dc..677dd58f99b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -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