Skip to content

Commit

Permalink
MDEV-10853 netcat help output in error log when running xtrabackup SST
Browse files Browse the repository at this point in the history
  • Loading branch information
hartmut-mariadb authored and Nirbhay Choubey committed Sep 28, 2016
1 parent 3dd88fb commit c9ded85
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/wsrep_sst_xtrabackup-v2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ get_transfer()
fi
wsrep_log_info "Using netcat as streamer"
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
if nc -h | grep -q ncat;then
if nc -h 2>&1 | grep -q ncat;then
tcmd="nc -l ${TSST_PORT}"
else
tcmd="nc -dl ${TSST_PORT}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/wsrep_sst_xtrabackup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ get_transfer()
fi
wsrep_log_info "Using netcat as streamer"
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
if nc -h | grep -q ncat;then
if nc -h 2>&1 | grep -q ncat;then
tcmd="nc -l ${TSST_PORT}"
else
tcmd="nc -dl ${TSST_PORT}"
Expand Down

0 comments on commit c9ded85

Please sign in to comment.