diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-04-12 10:31:56 +1000 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-04-13 13:49:39 +0300 |
| commit | 1749a68968064278e13b43abfe93aff11e46b9a2 (patch) | |
| tree | d5d37fccb1dc0873de51c0a515c36b3b9371f7b4 | |
| parent | c8e0c524af83149e77c88e9a6fd763221dea9277 (diff) | |
| download | mariadb-git-1749a68968064278e13b43abfe93aff11e46b9a2.tar.gz | |
mtr: remove --binary from patch args
This causes problems on FreeBSD which doesn't have a patch
that supports this.
Linux and Windows don't require it either.
Was added in c39877071a5ce8ba3c8dc7a1963e3c542e6cc83b without
explaination.
| -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 677dd58f99b..51e0ef1b0dc 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/--binary -r - -f -s -o/, + my @cmd = ($exe_patch, qw/-r - -f -s -o/, $dest, $base_result, $resfile); if (-w $resdir) { # don't rebuild a file if it's up to date |