diff options
| author | Hartmut Holzgraefe <hartmut@mariadb.com> | 2016-09-21 10:51:37 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-22 17:26:18 -0400 |
| commit | 04f92dde67a3d4f6fcbdbf65fdb63a54ff6761d8 (patch) | |
| tree | 27fb9bd0fa6cf09534e2ee5c8dae5452e442316c | |
| parent | 81c13acfb3585baf435eb37955561053f02e12bb (diff) | |
| download | mariadb-git-04f92dde67a3d4f6fcbdbf65fdb63a54ff6761d8.tar.gz | |
MDEV-10853 netcat help output in error log when running xtrabackup SST
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup-v2.sh | 2 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh index 962c170dc1b..327c92fb6cf 100644 --- a/scripts/wsrep_sst_xtrabackup-v2.sh +++ b/scripts/wsrep_sst_xtrabackup-v2.sh @@ -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}" diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh index 7279c623288..7ba421840ab 100644 --- a/scripts/wsrep_sst_xtrabackup.sh +++ b/scripts/wsrep_sst_xtrabackup.sh @@ -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}" |