diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2021-06-30 16:48:56 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2021-06-30 16:48:56 +0000 |
| commit | 89b30bb9de066abf8e3710b8f5f37bbe0489b549 (patch) | |
| tree | e2431898ae329b9274b9b145c7e069ff18fad5a7 /databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh | |
| parent | mail/alpine: update to 2.24.2 (diff) | |
databases/mariadb104-server: Update to 10.4.20
* Fix build on RISC-V and i386 [1]
* Fix plist issue with WSREP on i386 [1]
PR: 256618
Submitted by: Robert Clausecker <fuz fuz su>
Diffstat (limited to 'databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh')
| -rw-r--r-- | databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 2b81b4eca7b8..dc45c2d238c7 100644 --- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,11 +1,11 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC +--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-09 14:23:11.000000000 +0200 +++ scripts/wsrep_sst_mariabackup.sh -@@ -605,7 +605,7 @@ recv_joiner() - set +e - - if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then -- if timeout --help | grep -q -- '-k';then -+ if timeout --help 2>&1 | grep -q -- '-k';then - ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" - else - ltcmd="timeout -s9 $tmt $tcmd" +@@ -696,7 +696,7 @@ + local ltcmd="$tcmd" + if [ $tmt -gt 0 ]; then + if [ -n "$(command -v timeout)" ]; then +- if timeout --help | grep -qw -- '-k'; then ++ if timeout --help 2>&1 | grep -qw -- '-k'; then + ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" + else + ltcmd="timeout -s9 $tmt $tcmd" |