diff options
| author | Alexey Yurchenko <ayurchen@gmail.com> | 2014-12-09 22:13:14 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-08 17:41:04 -0400 |
| commit | 14b6172075eda88675d8b34951e0ee5f3f5874e3 (patch) | |
| tree | 820fd894f47cda95fb67b854d4a3a61a0c8654c6 /scripts/wsrep_sst_rsync.sh | |
| parent | 91417b404716e3c409a0a551a232c063d04f85a9 (diff) | |
| download | mariadb-git-14b6172075eda88675d8b34951e0ee5f3f5874e3.tar.gz | |
Going more MTR-friendly - for SST prefer to use mysql client, mysqldump and my_print_defaults from the local build tree.
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 86bf557662d..f5e304a1033 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -92,8 +92,7 @@ fi WSREP_LOG_DIR=${WSREP_LOG_DIR:-""} # if WSREP_LOG_DIR env. variable is not set, try to get it from my.cnf if [ -z "$WSREP_LOG_DIR" ]; then - SCRIPT_DIR="$(cd $(dirname "$0"); pwd -P)" - WSREP_LOG_DIR=$($SCRIPT_DIR/my_print_defaults --defaults-file \ + WSREP_LOG_DIR=$($MY_PRINT_DEFAULTS --defaults-file \ "$WSREP_SST_OPT_CONF" mysqld server mysqld-10.0 mariadb mariadb-10.0 \ | grep -- '--innodb[-_]log[-_]group[-_]home[-_]dir=' \ | cut -b 29- ) |