diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-04 09:22:59 +0200 |
| commit | 145ae15a33210e13d33d6f41b145b3f04cab2263 (patch) | |
| tree | 02810e3c0d629f7d7def2dbc663154cbdb53242f /scripts | |
| parent | acd2862e65a6555fba6065b7b4ded8513e2ce37c (diff) | |
| parent | 1a1bda2222e0c2ab41baed1510f6fbca80c20d31 (diff) | |
| download | mariadb-git-145ae15a33210e13d33d6f41b145b3f04cab2263.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup-v2.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 80a93c979ac..c0be1ea6e60 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -977,8 +977,8 @@ if expr "${-}" : '.*x' > /dev/null then : else - exec 1>&- - exec 2>&- + exec 1>/dev/null + exec 2>/dev/null fi # maximum number of wsrep restarts diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh index 40e686d4d6b..9284bf78019 100644 --- a/scripts/wsrep_sst_xtrabackup-v2.sh +++ b/scripts/wsrep_sst_xtrabackup-v2.sh @@ -1072,7 +1072,7 @@ then wsrep_log_info "Cleaning the existing datadir and innodb-data/log directories" - find $ib_home_dir $ib_log_dir $ib_undo_dir $DATA -mindepth 1 -regex $cpat -prune -o -exec rm -rfv {} 1>&2 \+ + find $ib_home_dir $ib_log_dir $ib_undo_dir $DATA -mindepth 1 -prune -regex $cpat -o -exec rm -rfv {} 1>&2 \+ tempdir=$(parse_cnf mysqld log-bin "") if [[ -n ${tempdir:-} ]];then |