1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903

This commit is contained in:
Seppo Jaakola
2013-08-21 17:17:30 +03:00
parent 2db87f6516
commit fca065f95c
15 changed files with 132 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
# Copyright (C) 2010 Codership Oy
# Copyright (C) 2012 Codership Oy
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
set -u
WSREP_SST_OPT_BYPASS=0
WSREP_SST_OPT_DATA=""
while [ $# -gt 0 ]; do
case "$1" in
@@ -86,7 +87,12 @@ shift
done
readonly WSREP_SST_OPT_BYPASS
SST_PROGRESS_FILE="$WSREP_SST_OPT_DATA/sst_in_progress"
if [ -n "$WSREP_SST_OPT_DATA" ]
then
SST_PROGRESS_FILE="$WSREP_SST_OPT_DATA/sst_in_progress"
else
SST_PROGRESS_FILE=""
fi
wsrep_log()
{
@@ -108,6 +114,6 @@ wsrep_log_info()
wsrep_cleanup_progress_file()
{
rm -f $SST_PROGRESS_FILE 2>/dev/null
[ -n "$SST_PROGRESS_FILE" ] && rm -f "$SST_PROGRESS_FILE" 2>/dev/null
}