summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrii Nikitin <andrii.nikitin@mariadb.com>2017-10-09 10:22:47 +0200
committerAndrii Nikitin <andrii.nikitin@mariadb.com>2017-10-09 10:22:47 +0200
commit494d1bf8859bbc9f80779144d07ce0603523d813 (patch)
tree0e1a441b783394cd50f27ca19f192aee0b1aa830
parent5eb666ad37ff80e5f8dc714bb68fcb1e269b797a (diff)
downloadmariadb-git-494d1bf8859bbc9f80779144d07ce0603523d813.tar.gz
MDEV-14010 merge issue in wsrep_sst_xtrabackup-v2
-rw-r--r--scripts/wsrep_sst_xtrabackup-v2.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
index 78a7d76da09..faa7bc5e815 100644
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -37,7 +37,6 @@ REMOTEIP=""
REMOTEHOST=""
tca=""
tcert=""
-tpem=""
tkey=""
sockopt=""
progress=""
@@ -358,8 +357,7 @@ get_transfer()
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
wsrep_log_info "Decrypting with CERT: $tcert, KEY: $tkey"
tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tcert},key=${tkey},verify=0${joiner_extra}${sockopt} stdio"
- tcmd="socat -u openssl-listen:${TSST_PORT},reuseaddr,cert=${tpem},key=${tkey},verify=0${sockopt} stdio"
- else
+ else
wsrep_log_info "Encrypting with CERT: $tcert, KEY: $tkey"
tcmd="socat -u stdio openssl-connect:${REMOTEIP}:${TSST_PORT},cert=${tcert},key=${tkey},verify=0${sockopt}"
fi