diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-06 13:49:10 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-06-06 13:49:10 -0400 |
| commit | d3b2e780d6ddee9a4f434ba9928f77127bbbeeb1 (patch) | |
| tree | b13d66a9f80c3151c07de0238c9c67d94730baa3 /scripts | |
| parent | 1ebc055f1bf7308de96aa81eba71b58d0af42a4b (diff) | |
| download | mariadb-git-d3b2e780d6ddee9a4f434ba9928f77127bbbeeb1.tar.gz | |
Updated default load option groups.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/wsrep_sst_rsync.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index a7878ae22a5..bd8f03846e9 100755 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -23,11 +23,11 @@ RSYNC_CONF= OS=$(uname) [ "$OS" == "Darwin" ] && export -n LD_LIBRARY_PATH -. $(dirname $0)/wsrep_sst_common - # Setting the path for lsof on CentOS export PATH="/usr/sbin:/sbin:$PATH" +. $(dirname $0)/wsrep_sst_common + cleanup_joiner() { wsrep_log_info "Joiner cleanup." @@ -83,7 +83,7 @@ WSREP_LOG_DIR=${WSREP_LOG_DIR:-""} if [ -z "$WSREP_LOG_DIR" ]; then SCRIPT_DIR="$(cd $(dirname "$0"); pwd -P)" WSREP_LOG_DIR=$($SCRIPT_DIR/my_print_defaults --defaults-file \ - "$WSREP_SST_OPT_CONF" mysqld server mysqld-5.5 \ + "$WSREP_SST_OPT_CONF" mysqld server mysqld-5.5 mariadb mariadb-5.5 \ | grep -- '--innodb[-_]log[-_]group[-_]home[-_]dir=' \ | cut -b 29- ) fi |