[Commits] c9ded85: MDEV-10853 netcat help output in error log when running xtrabackup SST

Nirbhay Choubey nirbhay at mariadb.com
Wed Sep 28 19:53:44 EEST 2016


revision-id: c9ded859a6fad25fc513d3a0c7d17f826e567691 (mariadb-galera-10.0.27-3-gc9ded85)
parent(s): 3dd88fbd1132ae36c00adb67cbe2fc4ff97a6789
author: Hartmut Holzgraefe
committer: Nirbhay Choubey
timestamp: 2016-09-28 12:53:43 -0400
message:

MDEV-10853 netcat help output in error log when running xtrabackup SST

---
 scripts/wsrep_sst_xtrabackup-v2.sh | 2 +-
 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 b5556c6..6ce3120 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 b40be20..287faf6 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}"


More information about the commits mailing list