Skip to content

M
MariaDB
Commit 08c493c6 authored by Sergei Golubchik's avatar Sergei Golubchik
Browse files
Options

Merge branch '10.1' into 10.2

parents 8898c161 bcda03b4
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
scripts/mysqld_safe.sh
View file @ 08c493c6
...@@ -245,7 +245,7 @@ wsrep_recover_position() { ...@@ -245,7 +245,7 @@ wsrep_recover_position() {
local euid=$(id -u) local euid=$(id -u)
local ret=0 local ret=0
local wr_logfile=$(mktemp wsrep_recovery.XXXXXX) local wr_logfile=$(mktemp /tmp/wsrep_recovery.XXXXXX)
# safety checks # safety checks
if [ -z $wr_logfile ]; then if [ -z $wr_logfile ]; then
...@@ -267,7 +267,7 @@ wsrep_recover_position() { ...@@ -267,7 +267,7 @@ wsrep_recover_position() {
log_notice "WSREP: Running position recovery with $wr_options" 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)" local rp="$(grep 'WSREP: Recovered position:' $wr_logfile)"
if [ -z "$rp" ]; then if [ -z "$rp" ]; then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7