database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merged revisions 3409..3411 from mariadb-galera-5.5

Browse Source
This commit is contained in:
Seppo Jaakola
2013-10-06 23:59:20 +03:00
parent 089f10feb4
commit 337fdb80f3
8 changed files with 1251 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/mysqld_safe.sh
View File

@ -239,7 +239,8 @@ wsrep_recover_position() {
if [ -z "$rp" ]; then
local skipped="$(grep WSREP $wr_logfile | grep 'skipping position recovery')"
if [ -z "$skipped" ]; then
log_error "WSREP: Failed to recover position: " `cat $wr_logfile`;
log_error "WSREP: Failed to recover position:
'`cat $wr_logfile`'"
ret=1
else
log_notice "WSREP: Position recovery skipped"
@ -251,7 +252,7 @@ wsrep_recover_position() {
wsrep_start_position_opt="--wsrep_start_position=$start_pos"
fi
rm $wr_logfile
[ $ret -eq 0 ] && rm $wr_logfile
return $ret
}