diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-04 18:36:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-04 18:36:58 +0200 |
| commit | 08c493c62afae0e81f9da6bb9b86efe99a9a763d (patch) | |
| tree | c10492a317163dbb2688d0d921a6df0dd8426d5b /scripts/mysqld_safe.sh | |
| parent | 8898c1614d31a73b653988a0d8e13cee8f3e00b0 (diff) | |
| parent | bcda03b4fa3ce8286a264bf3c9b1996ba7088d4f (diff) | |
| download | mariadb-git-08c493c62afae0e81f9da6bb9b86efe99a9a763d.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts/mysqld_safe.sh')
| -rw-r--r-- | scripts/mysqld_safe.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 3a06f7e4858..b06106ceae6 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -245,7 +245,7 @@ wsrep_recover_position() { local euid=$(id -u) local ret=0 - local wr_logfile=$(mktemp wsrep_recovery.XXXXXX) + local wr_logfile=$(mktemp /tmp/wsrep_recovery.XXXXXX) # safety checks if [ -z $wr_logfile ]; then @@ -267,7 +267,7 @@ wsrep_recover_position() { log_notice "WSREP: Running position recovery with $wr_options" - eval_log_error "$mysqld_cmd --wsrep_recover $wr_options 2> $wr_logfile" + eval "$mysqld_cmd --wsrep_recover $wr_options 2> $wr_logfile" local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)" if [ -z "$rp" ]; then |