summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-04-26 13:58:40 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2023-04-26 13:58:40 +0300
commitc15c8ef3e357a3e01f775f20027fdac9b227099f (patch)
tree28546c4ce6756ad96dff092b43fde26d049862a8 /scripts
parent3c2507789908df103949670fe43412e220718a6e (diff)
parent5740638c4c3337a0021a82f5b744afca1ab1346c (diff)
downloadmariadb-git-c15c8ef3e357a3e01f775f20027fdac9b227099f.tar.gz
Merge 10.6 into 10.8
Diffstat (limited to 'scripts')
-rw-r--r--scripts/wsrep_sst_mariabackup.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index 6ec975f5a59..d6334052f24 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -340,6 +340,9 @@ get_transfer()
"Use workaround for socat $SOCAT_VERSION bug"
fi
fi
+ if check_for_version "$SOCAT_VERSION" '1.7.4'; then
+ tcmd="$tcmd,no-sni=1"
+ fi
fi
if [ "${sockopt#*,dhparam=}" = "$sockopt" ]; then