database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-10-04 18:36:58 +02:00
parent 8898c1614d bcda03b4fa
commit 08c493c62a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/mysqld_safe.sh
View File

@ -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() {
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