diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-25 12:22:57 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-05-25 12:22:57 +0300 |
| commit | 9d1546fe2cdced5efb4af831fa2e560b7f80fb54 (patch) | |
| tree | 53701c8fc97aa5efce5d901fda1395e82dd49a79 /scripts/wsrep_sst_xtrabackup.sh | |
| parent | 48af4be62a077f5edfadc9b5ea4f6c8c4b00c469 (diff) | |
| download | mariadb-git-9d1546fe2cdced5efb4af831fa2e560b7f80fb54.tar.gz | |
References: MDEV-4572 - merge with lp:codership-mysql/5.5-23 revisions 3858..3867
Diffstat (limited to 'scripts/wsrep_sst_xtrabackup.sh')
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh index 08cd221c2a2..f9bddd7bd4e 100644 --- a/scripts/wsrep_sst_xtrabackup.sh +++ b/scripts/wsrep_sst_xtrabackup.sh @@ -98,16 +98,9 @@ then if [ $WSREP_SST_OPT_BYPASS -eq 0 ] then - TMPDIR=${TMPDIR:-""} - if [ -z "${TMPDIR}" ]; then - # try to get it from my.cnf - TMPDIR=$(grep -E '^\s*tmpdir' $WSREP_SST_OPT_CONF | \ - awk -F = '{ print $2 }' | sed 's/^\s//g' | sed 's/\s.*//g' ) - # if failed default to /tmp - [ -z "${TMPDIR}" ] && TMPDIR="/tmp" - fi + TMPDIR=${TMPDIR:-"/tmp"} - INNOBACKUPEX_ARGS="--galera-info --tmpdir=${TMPDIR} --stream=tar + INNOBACKUPEX_ARGS="--galera-info --stream=tar --defaults-file=${WSREP_SST_OPT_CONF} --socket=${WSREP_SST_OPT_SOCKET}" |