1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Fix timeout(1) usage in wsrep_sst_mariabackup on *BSD

Also fix the usage of timeout(1) on NetBSD, OpenBSD and DragonFly.
This commit is contained in:
Brad Smith
2023-12-30 16:30:22 -05:00
committed by Daniel Black
parent 81f3e97bc8
commit 44f5fa2db9

View File

@@ -803,7 +803,8 @@ recv_joiner()
if [ $tmt -gt 0 ]; then
if [ -n "$(commandex timeout)" ]; then
local koption=0
if [ "$OS" = 'FreeBSD' ]; then
if [ "$OS" = 'FreeBSD' -o "$OS" = 'NetBSD' -o "$OS" = 'OpenBSD' -o \
"$OS" = 'DragonFly' ]; then
if timeout 2>&1 | grep -qw -F -- '-k'; then
koption=1
fi