diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2018-01-10 12:36:55 +0300 |
| commit | c59c1a0736e36e9c66f798d199a124f362353377 (patch) | |
| tree | 80ee18faad049687b0b4f0e2f147caf870d68390 /scripts | |
| parent | 26971c9aea67a62f348cd105348a8dc4407bcf4a (diff) | |
| parent | 0b597d3ab2494bc1db97cc4a30d697a5fdf48c21 (diff) | |
| download | mariadb-git-c59c1a0736e36e9c66f798d199a124f362353377.tar.gz | |
System Versioning 1.0 pre8
Merge branch '10.3' into trunk
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 |