Merge lp:~percona-core/percona-xtradb-cluster/bug-1405668-5.5 into lp:percona-xtradb-cluster/5.5

[Raghavendra D Prabhu]

[Alexey Kopytov (akopytov)]

Please resubmit on Github.

review: Needs Resubmitting

Unmerged revisions

843. By Raghavendra D Prabhu on 2015-01-05

Bug#1405985 Port the fixes of lp:1407599 and lp:1405985

842. By Raghavendra D Prabhu on 2015-01-04

Merge changes from trunk-25-bug-1380697

841. By Raghavendra D Prabhu on 2015-01-04

Merge trunk-25-bug-1402166

840. By Raghavendra D Prabhu on 2015-01-04

Merge trunk-25-bug-1380697

839. By Raghavendra D Prabhu on 2015-01-04

Merge trunk-25-bug-1403566/

838. By Raghavendra D Prabhu on 2015-01-04

Merge trunk-25-bug-1402338

=== modified file 'percona-xtradb-cluster-tests/conf/conf20.cnf-node1'
--- percona-xtradb-cluster-tests/conf/conf20.cnf-node1	2014-02-08 14:16:24 +0000
+++ percona-xtradb-cluster-tests/conf/conf20.cnf-node1	2015-01-27 18:30:35 +0000
@@ -15,5 +15,5 @@
 encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
 
 [sst]
-cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
+cpat='.*galera\.cache$\|.*sst_in_progress$\|.*\.sst$\|.*gvwstate\.dat$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
 encrypt=1

=== modified file 'percona-xtradb-cluster-tests/conf/conf20.cnf-node2'
--- percona-xtradb-cluster-tests/conf/conf20.cnf-node2	2014-02-08 14:16:24 +0000
+++ percona-xtradb-cluster-tests/conf/conf20.cnf-node2	2015-01-27 18:30:35 +0000
@@ -15,5 +15,5 @@
 encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
 
 [sst]
-cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
+cpat='.*galera\.cache$\|.*sst_in_progress$\|.*\.sst$\|.*gvwstate\.dat$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
 encrypt=1

=== modified file 'percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh'
--- percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh	2013-11-28 09:31:22 +0000
+++ percona-xtradb-cluster-tests/t/xb_galera_sst_advanced-v2.sh	2015-01-27 18:30:35 +0000
@@ -12,6 +12,7 @@
 SUSER="root"
 SMDSUM="d35d212fdfe9452e711704e3dc3e93cf"
 EXTRAFILE=${CONF:-}
+ADDNLOP=${ADDNLOP:-""}
 
 
 if [[ -n ${EXTRAFILE:-} ]];then 
@@ -33,7 +34,7 @@
 
 vlog "Starting server $node1"
 MYSQLD_EXTRA_MY_CNF_OPTS="!include $EXTRAFILE1"
-start_server_with_id $node1 --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --innodb_file_per_table  --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_sst_receive_address=$recv_addr1 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1${pdebug}" --wsrep_sst_method=xtrabackup-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug 
+start_server_with_id $node1 --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --innodb_file_per_table  --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm:// --wsrep_sst_receive_address=$recv_addr1 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr1${pdebug}" --wsrep_sst_method=xtrabackup-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug $ADDNLOP
 
 vlog "Sleeping before loading data"
 sleep 8
@@ -48,7 +49,7 @@
 
 vlog "Starting server $node2"
 MYSQLD_EXTRA_MY_CNF_OPTS="!include $EXTRAFILE2"
-start_server_with_id $node2   --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --innodb_file_per_table --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm://$listen_addr1 --wsrep_sst_receive_address=$recv_addr2 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2${pdebug}" --wsrep_sst_method=xtrabackup-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug
+start_server_with_id $node2   --innodb_flush_method=O_DIRECT --innodb_autoinc_lock_mode=2  --innodb_locks_unsafe_for_binlog=1 --wsrep-slave-threads=2 --innodb_file_per_table --binlog-format=ROW --wsrep-provider=${MYSQL_BASEDIR}/lib/libgalera_smm.so --wsrep_cluster_address=gcomm://$listen_addr1 --wsrep_sst_receive_address=$recv_addr2 --wsrep_node_incoming_address=$ADDR --wsrep_provider_options="gmcast.listen_addr=tcp://$listen_addr2${pdebug}" --wsrep_sst_method=xtrabackup-v2 --wsrep_sst_auth=$SUSER:$SSTPASS  --wsrep_node_address=$ADDR $debug $ADDNLOP
 switch_server $node2
 
 # The password propagates through SST

=== added file 'scripts/clustercheck.sh'
--- scripts/clustercheck.sh	1970-01-01 00:00:00 +0000
+++ scripts/clustercheck.sh	2015-01-27 18:30:35 +0000
@@ -0,0 +1,94 @@
+#!/bin/bash 
+#
+# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly
+#
+# Authors:
+# Raghavendra Prabhu <[e-mail]>
+# Olaf van Zandwijk <[e-mail]>
+#
+# Based on the original script from Unai Rodriguez and Olaf (https://github.com/olafz/percona-clustercheck)
+#
+# Grant privileges required:
+# GRANT PROCESS ON *.* TO 'clustercheckuser'@'localhost' IDENTIFIED BY 'clustercheckpassword!';
+
+if [[ $1 == '-h' || $1 == '--help' ]];then
+    echo "Usage: $0 <user> <pass> <available_when_donor=0|1> <log_file> <available_when_readonly=0|1> <defaults_extra_file>"
+    exit
+fi
+
+MYSQL_USERNAME="${1-clustercheckuser}" 
+MYSQL_PASSWORD="${2-clustercheckpassword!}" 
+AVAILABLE_WHEN_DONOR=${3:-0}
+ERR_FILE="${4:-/dev/null}" 
+AVAILABLE_WHEN_READONLY=${5:-1}
+DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
+#Timeout exists for instances where mysqld may be hung
+TIMEOUT=10
+
+EXTRA_ARGS=""
+if [[ -n "$MYSQL_USERNAME" ]]; then
+    EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}"
+fi
+if [[ -n "$MYSQL_PASSWORD" ]]; then
+    EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}"
+fi
+if [[ -r $DEFAULTS_EXTRA_FILE ]];then 
+    MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
+                    ${EXTRA_ARGS}"
+else 
+    MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}"
+fi
+#
+# Perform the query to check the wsrep_local_state
+#
+WSREP_STATUS=($($MYSQL_CMDLINE -e "SHOW GLOBAL STATUS LIKE 'wsrep_%';"  \
+    2>${ERR_FILE} | grep -A 1 -E 'wsrep_local_state$|wsrep_cluster_status$' \
+    | sed -n -e '2p'  -e '5p' | tr '\n' ' '))
+ 
+if [[ ${WSREP_STATUS[1]} == 'Primary' && ( ${WSREP_STATUS[0]} -eq 4 || \
+    ( ${WSREP_STATUS[0]} -eq 2 && $AVAILABLE_WHEN_DONOR -eq 1 ) ) ]]
+then 
+
+    # Check only when set to 0 to avoid latency in response.
+    if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
+        READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
+                    2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
+
+        if [[ "${READ_ONLY}" == "ON" ]];then 
+            # Percona XtraDB Cluster node local state is 'Synced', but it is in
+            # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
+            # => return HTTP 503
+            # Shell return-code is 1
+            echo -en "HTTP/1.1 503 Service Unavailable\r\n" 
+            echo -en "Content-Type: text/plain\r\n" 
+            echo -en "Connection: close\r\n" 
+            echo -en "Content-Length: 43\r\n" 
+            echo -en "\r\n" 
+            echo -en "Percona XtraDB Cluster Node is read-only.\r\n" 
+            sleep 0.1
+            exit 1
+        fi
+
+    fi
+    # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200
+    # Shell return-code is 0
+    echo -en "HTTP/1.1 200 OK\r\n" 
+    echo -en "Content-Type: text/plain\r\n" 
+    echo -en "Connection: close\r\n" 
+    echo -en "Content-Length: 40\r\n" 
+    echo -en "\r\n" 
+    echo -en "Percona XtraDB Cluster Node is synced.\r\n" 
+    sleep 0.1
+    exit 0
+else 
+    # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503
+    # Shell return-code is 1
+    echo -en "HTTP/1.1 503 Service Unavailable\r\n" 
+    echo -en "Content-Type: text/plain\r\n" 
+    echo -en "Connection: close\r\n" 
+    echo -en "Content-Length: 57\r\n" 
+    echo -en "\r\n" 
+    echo -en "Percona XtraDB Cluster Node is not synced or non-PRIM. \r\n" 
+    sleep 0.1
+    exit 1
+fi 

=== removed file 'scripts/clustercheck.sh'
--- scripts/clustercheck.sh	2014-08-30 06:05:25 +0000
+++ scripts/clustercheck.sh	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-#!/bin/bash 
-#
-# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly
-#
-# Authors:
-# Raghavendra Prabhu <[e-mail]>
-# Olaf van Zandwijk <[e-mail]>
-#
-# Based on the original script from Unai Rodriguez and Olaf (https://github.com/olafz/percona-clustercheck)
-#
-# Grant privileges required:
-# GRANT PROCESS ON *.* TO 'clustercheckuser'@'localhost' IDENTIFIED BY 'clustercheckpassword!';
-
-if [[ $1 == '-h' || $1 == '--help' ]];then
-    echo "Usage: $0 <user> <pass> <available_when_donor=0|1> <log_file> <available_when_readonly=0|1> <defaults_extra_file>"
-    exit
-fi
-
-MYSQL_USERNAME="${1-clustercheckuser}" 
-MYSQL_PASSWORD="${2-clustercheckpassword!}" 
-AVAILABLE_WHEN_DONOR=${3:-0}
-ERR_FILE="${4:-/dev/null}" 
-AVAILABLE_WHEN_READONLY=${5:-1}
-DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
-#Timeout exists for instances where mysqld may be hung
-TIMEOUT=10
-
-EXTRA_ARGS=""
-if [[ -n "$MYSQL_USERNAME" ]]; then
-    EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}"
-fi
-if [[ -n "$MYSQL_PASSWORD" ]]; then
-    EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}"
-fi
-if [[ -r $DEFAULTS_EXTRA_FILE ]];then 
-    MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
-                    ${EXTRA_ARGS}"
-else 
-    MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}"
-fi
-#
-# Perform the query to check the wsrep_local_state
-#
-WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \
-    2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
- 
-if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]]
-then 
-
-    # Check only when set to 0 to avoid latency in response.
-    if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
-        READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
-                    2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
-
-        if [[ "${READ_ONLY}" == "ON" ]];then 
-            # Percona XtraDB Cluster node local state is 'Synced', but it is in
-            # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
-            # => return HTTP 503
-            # Shell return-code is 1
-            echo -en "HTTP/1.1 503 Service Unavailable\r\n" 
-            echo -en "Content-Type: text/plain\r\n" 
-            echo -en "Connection: close\r\n" 
-            echo -en "Content-Length: 43\r\n" 
-            echo -en "\r\n" 
-            echo -en "Percona XtraDB Cluster Node is read-only.\r\n" 
-            sleep 0.1
-            exit 1
-        fi
-
-    fi
-    # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200
-    # Shell return-code is 0
-    echo -en "HTTP/1.1 200 OK\r\n" 
-    echo -en "Content-Type: text/plain\r\n" 
-    echo -en "Connection: close\r\n" 
-    echo -en "Content-Length: 40\r\n" 
-    echo -en "\r\n" 
-    echo -en "Percona XtraDB Cluster Node is synced.\r\n" 
-    sleep 0.1
-    exit 0
-else 
-    # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503
-    # Shell return-code is 1
-    echo -en "HTTP/1.1 503 Service Unavailable\r\n" 
-    echo -en "Content-Type: text/plain\r\n" 
-    echo -en "Connection: close\r\n" 
-    echo -en "Content-Length: 44\r\n" 
-    echo -en "\r\n" 
-    echo -en "Percona XtraDB Cluster Node is not synced.\r\n" 
-    sleep 0.1
-    exit 1
-fi 

=== modified file 'scripts/wsrep_sst_xtrabackup-v2.sh'
--- scripts/wsrep_sst_xtrabackup-v2.sh	2014-09-04 18:46:14 +0000
+++ scripts/wsrep_sst_xtrabackup-v2.sh	2015-01-27 18:30:35 +0000
@@ -29,6 +29,8 @@
 encrypt=0
 nproc=1
 ecode=0
+ssyslog=""
+ssystag=""
 XTRABACKUP_PID=""
 SST_PORT=""
 REMOTEIP=""
@@ -308,6 +310,15 @@
     iapts=$(parse_cnf sst inno-apply-opts "")
     impts=$(parse_cnf sst inno-move-opts "")
     stimeout=$(parse_cnf sst sst-initial-timeout 100)
+    ssyslog=$(parse_cnf sst sst-syslog 0)
+    ssystag=$(parse_cnf mysqld_safe syslog-tag "${SST_SYSLOG_TAG:-}")
+    ssystag+="-"
+
+    if [[ $ssyslog -ne -1 ]];then 
+        if my_print_defaults -c $WSREP_SST_OPT_CONF mysqld_safe | tr '_' '-' | grep -q -- "--syslog";then 
+            ssyslog=1
+        fi
+    fi
 }
 
 get_stream()
@@ -363,6 +374,14 @@
     if [[ -n ${STATDIR:-} ]];then 
        [[ -d $STATDIR ]] && rm -rf $STATDIR
     fi
+
+    sleep 10
+
+    # Final cleanup 
+    pgid=$(ps -o pgid= $$ | grep -o '[0-9]*')
+    kill -TERM -$pgid || true
+
+    exit $estatus
 }
 
 check_pid()
@@ -403,6 +422,14 @@
     if [[ -n $itmpdir ]];then 
        [[ -d $itmpdir ]] &&  rm -rf $itmpdir || true
     fi
+
+    sleep 10
+
+    # Final cleanup 
+    pgid=$(ps -o pgid= $$ | grep -o '[0-9]*')
+    kill -TERM -$pgid || true
+
+    exit $estatus
 }
 
 kill_xtrabackup()
@@ -551,19 +578,48 @@
 
 read_cnf
 setup_ports
+
+if ${INNOBACKUPEX_BIN} /tmp --help 2>/dev/null | grep -q -- '--version-check'; then 
+    disver="--no-version-check"
+fi
+
+
+INNOEXTRA=""
+
+if [[ $ssyslog -eq 1 ]];then 
+
+    if [[ ! -x `which logger` ]];then 
+        wsrep_log_error "logger not in path: $PATH. Ignoring"
+    else
+
+        wsrep_log_info "Logging all stderr of SST/Innobackupex to syslog"
+
+        exec 2> >(logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE)
+
+        wsrep_log_error()
+        {
+            logger  -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@" 
+        }
+
+        wsrep_log_info()
+        {
+            logger  -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@" 
+        }
+
+        INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} 2>&1  | logger -p daemon.err -t ${ssystag}innobackupex-apply "
+        INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts  --move-back --force-non-empty-directories \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-move "
+        INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2> >(logger -p daemon.err -t ${ssystag}innobackupex-backup)"
+    fi
+
+else 
+    INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
+    INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts  --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
+    INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
+fi
+
 get_stream
 get_transfer
 
-if ${INNOBACKUPEX_BIN} /tmp --help  | grep -q -- '--version-check'; then 
-    disver="--no-version-check"
-fi
-
-
-INNOEXTRA=""
-INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
-INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts  --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
-INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
-
 if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
 then
     trap cleanup_donor EXIT
@@ -810,6 +866,11 @@
 
         get_proc
 
+        if [[ ! -s ${DATA}/xtrabackup_checkpoints ]];then 
+            wsrep_log_error "xtrabackup_checkpoints missing, failed innobackupex/SST on donor"
+            exit 2
+        fi
+
         # Rebuild indexes for compact backups
         if grep -q 'compact = 1' ${DATA}/xtrabackup_checkpoints;then 
             wsrep_log_info "Index compaction detected"

=== modified file 'sql/wsrep_mysqld.cc'
--- sql/wsrep_mysqld.cc	2014-08-25 18:02:27 +0000
+++ sql/wsrep_mysqld.cc	2015-01-27 18:30:35 +0000
@@ -1375,13 +1375,25 @@
 int wsrep_to_isolation_begin(THD *thd, char *db_, char *table_,
                              const TABLE_LIST* table_list)
 {
-
+  LEX *lex;
   /*
     No isolation for applier or replaying threads.
    */
   if (thd->wsrep_exec_mode == REPL_RECV) return 0;
 
-  int ret= 0;
+  lex = thd->lex;
+  if (!wsrep_replicate_myisam && lex->create_info.db_type && lex->create_info.db_type->db_type == DB_TYPE_MYISAM)
+  {
+    if (db_) {
+        WSREP_INFO("Cannot replicate MyISAM DDL for %s.%s with wsrep_replicate_myisam OFF", db_, table_);
+    } else {
+        WSREP_INFO("Cannot replicate MyISAM DDL with wsrep_replicate_myisam OFF");
+    }
+
+    return 0;
+  }
+
+ int ret= 0;
   mysql_mutex_lock(&thd->LOCK_wsrep_thd);
 
   if (thd->wsrep_conflict_state == MUST_ABORT)

=== modified file 'sql/wsrep_sst.cc'
--- sql/wsrep_sst.cc	2015-01-09 18:57:00 +0000
+++ sql/wsrep_sst.cc	2015-01-27 18:30:35 +0000
@@ -384,6 +384,10 @@
     {
       WSREP_ERROR("Failed to read uuid:seqno from joiner script.");
       if (proc.error()) err = proc.error();
+    } 
+    else if ((err=proc.error())) 
+    {
+      WSREP_ERROR("SST script aborted with error %d (%s)", err,strerror(err));
     }
     else
     {