From d3b2e780d6ddee9a4f434ba9928f77127bbbeeb1 Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Fri, 6 Jun 2014 13:49:10 -0400
Subject: Updated default load option groups.

---
 scripts/wsrep_sst_rsync.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

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
-- 
cgit v1.2.1