diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 18:26:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 18:26:54 +0300 |
| commit | 9024498e88f01f235f56db1dc18389baaef5b0b2 (patch) | |
| tree | 8a67f6467f6077656beb96ea6d290c543b1856b4 /scripts | |
| parent | f2021b5ee4ef8c53bedbab309bad2feda4c73f46 (diff) | |
| parent | b46cf33ab8ce869af0f51c35026965d237d722c7 (diff) | |
| download | mariadb-git-9024498e88f01f235f56db1dc18389baaef5b0b2.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 4 | ||||
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 562b9b929f2..54632e5f79b 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -949,8 +949,10 @@ then tmpdir=$(parse_cnf "$encgroups" 'tmpdir') if [ -z "$tmpdir" ]; then xtmpdir="$(mktemp -d)" - else + elif [ "$OS" = 'Linux' ]; then xtmpdir=$(mktemp '-d' "--tmpdir=$tmpdir") + else + xtmpdir=$(TMPDIR="$tmpdir"; mktemp '-d') fi wsrep_log_info "Using '$xtmpdir' as mariabackup temporary directory" diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index d90e87b68f2..e16ed75cb16 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -725,8 +725,10 @@ EOF tmpdir=$(parse_cnf '--mysqld|sst' 'tmpdir') if [ -z "$tmpdir" ]; then tmpfile="$(mktemp)" - else + elif [ "$OS" = 'Linux' ]; then tmpfile=$(mktemp "--tmpdir=$tmpdir") + else + tmpfile=$(TMPDIR="$tmpdir"; mktemp '-d') fi wsrep_log_info "Extracting binlog files:" |