diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-04-13 16:25:32 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-04-13 16:25:32 +0300 |
| commit | 0b7a79c6b0d460c522f42f12cc73a1c79ae4e9a8 (patch) | |
| tree | e4388326aa52df83db420a0c44cd54e9d2ca8280 | |
| parent | 613bc18a361f59378e7c5096b9761de9ae59cdac (diff) | |
| download | mariadb-git-0b7a79c6b0d460c522f42f12cc73a1c79ae4e9a8.tar.gz | |
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.
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
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 |