summaryrefslogtreecommitdiff
path: root/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
blob: 3e3d42812b67479a93d0e1e0f07200da94029c4a (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
--- scripts/wsrep_sst_mariabackup.sh.orig	2022-02-17 10:18:49 UTC
+++ scripts/wsrep_sst_mariabackup.sh
@@ -715,7 +715,7 @@ recv_joiner()
     local ltcmd="$tcmd"
     if [ $tmt -gt 0 ]; then
         if [ -n "$(commandex 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"