diff options
| author | sachin <sachin.setiya@mariadb.com> | 2017-10-02 13:30:48 +0530 |
|---|---|---|
| committer | sachin <sachin.setiya@mariadb.com> | 2017-10-02 14:07:22 +0530 |
| commit | bcda03b4fa3ce8286a264bf3c9b1996ba7088d4f (patch) | |
| tree | e7920c6653c349214e1a82ac3899e50cd649c32e /scripts/mysqld_safe.sh | |
| parent | ac0b5a2e7983ea259ebc8947a0a82103e11a653b (diff) | |
| download | mariadb-git-bcda03b4fa3ce8286a264bf3c9b1996ba7088d4f.tar.gz | |
MDEV-13950 mysqld_safe could not start Galera node after upgrade ...
This is regression caused by patch of mdev-10767.
1st problem :- mktmp is invoked without '-t' or specifing tmp directory.
2nd problem :- Since eval_log_error redirect stderr to stdout '2>' will
return nothing. and hence $wr_logfile will be empty.
Patch Credit:- Andrii Nikitin
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 5564f92a27c..bcaf7b86f5f 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -246,7 +246,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 @@ -268,7 +268,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 |