* Removed unnecessary duplicate script files.

* Updated failing mtr tests.

mysql-test/r/mysqld--help.result

@@ -911,6 +911,9 @@ The following options may be given as the first argument:
  --wsrep-recover     Recover database state after crash and exit
  --wsrep-replicate-myisam 
  To enable myisam replication
+ --wsrep-restart-slave 
+ Should MySQL slave be restarted automatically, when node
+ joins back to cluster
  --wsrep-retry-autocommit=# 
  Max number of times to retry a failed autocommit
  statement
@@ -1204,6 +1207,7 @@ wsrep-provider none
 wsrep-provider-options 
 wsrep-recover FALSE
 wsrep-replicate-myisam FALSE
+wsrep-restart-slave FALSE
 wsrep-retry-autocommit 1
 wsrep-slave-threads 1
 wsrep-sst-auth (No default value)

mysql-test/suite/sys_vars/r/all_vars.result

@@ -38,6 +38,7 @@ wsrep_provider
 wsrep_provider_options
 wsrep_recover
 wsrep_replicate_myisam
+wsrep_restart_slave
 wsrep_retry_autocommit
 wsrep_slave_threads
 wsrep_sst_auth

scripts/wsrep_sst_common

-# Copyright (C) 2012 Codership Oy
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
-# MA  02110-1301  USA.
-
-# This is a common command line parser to be sourced by other SST scripts
-
-set -u
-
-WSREP_SST_OPT_BYPASS=0
-WSREP_SST_OPT_DATA=""
-
-while [ $# -gt 0 ]; do
-case "$1" in
-    '--address')
-        readonly WSREP_SST_OPT_ADDR="$2"
-        shift
-        ;;
-    '--auth')
-        WSREP_SST_OPT_AUTH="$2"
-        shift
-        ;;
-    '--bypass')
-        WSREP_SST_OPT_BYPASS=1
-        ;;
-    '--datadir')
-        readonly WSREP_SST_OPT_DATA="$2"
-        shift
-        ;;
-    '--defaults-file')
-        readonly WSREP_SST_OPT_CONF="$2"
-        shift
-        ;;
-    '--host')
-        readonly WSREP_SST_OPT_HOST="$2"
-        shift
-        ;;
-    '--local-port')
-        readonly WSREP_SST_OPT_LPORT="$2"
-        shift
-        ;;
-    '--parent')
-        readonly WSREP_SST_OPT_PARENT="$2"
-        shift
-        ;;
-    '--password')
-        readonly WSREP_SST_OPT_PSWD="$2"
-        shift
-        ;;
-    '--port')
-        readonly WSREP_SST_OPT_PORT="$2"
-        shift
-        ;;
-    '--role')
-        readonly WSREP_SST_OPT_ROLE="$2"
-        shift
-        ;;
-    '--socket')
-        readonly WSREP_SST_OPT_SOCKET="$2"
-        shift
-        ;;
-    '--user')
-        readonly WSREP_SST_OPT_USER="$2"
-        shift
-        ;;
-    '--gtid')
-        readonly WSREP_SST_OPT_GTID="$2"
-        shift
-        ;;
-    *) # must be command
-       # usage
-       # exit 1
-       ;;
-esac
-shift
-done
-readonly WSREP_SST_OPT_BYPASS
-
-# For Bug:1200727
-if my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -q "wsrep_sst_auth";then 
-    if [ -z $WSREP_SST_OPT_AUTH -o $WSREP_SST_OPT_AUTH = "(null)" ];then 
-            WSREP_SST_OPT_AUTH=$(my_print_defaults -c $WSREP_SST_OPT_CONF sst | grep -- "--wsrep_sst_auth" | cut -d= -f2)
-    fi
-fi
-
-if [ -n "${WSREP_SST_OPT_DATA:-}" ]
-then
-    SST_PROGRESS_FILE="$WSREP_SST_OPT_DATA/sst_in_progress"
-else
-    SST_PROGRESS_FILE=""
-fi
-
-
-wsrep_log()
-{
-    # echo everything to stderr so that it gets into common error log
-    # deliberately made to look different from the rest of the log
-    local readonly tst="$(date +%Y%m%d\ %H:%M:%S.%N | cut -b -21)"
-    echo "WSREP_SST: $* ($tst)" >&2
-}
-
-wsrep_log_error()
-{
-    wsrep_log "[ERROR] $*"
-}
-
-wsrep_log_info()
-{
-    wsrep_log "[INFO] $*"
-}
-
-wsrep_cleanup_progress_file()
-{
-    [ -n "$SST_PROGRESS_FILE" ] && rm -f "$SST_PROGRESS_FILE" 2>/dev/null
-}
-

support-files/wsrep_notify.sh

@@ -87,7 +87,6 @@ do
     --members)
         MEMBERS=$2
         shift
-        fi
         ;;
     esac
     shift