diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 17:17:30 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-08-21 17:17:30 +0300 |
| commit | fca065f95c3f62b0f6ec8448f7dcda40d73eb433 (patch) | |
| tree | 8d477005bfd14f335d91d8c66c0632f64c7599cb /scripts/wsrep_sst_common.sh | |
| parent | 2db87f65167c389c191336672e7ae1ddc65c8436 (diff) | |
| download | mariadb-git-fca065f95c3f62b0f6ec8448f7dcda40d73eb433.tar.gz | |
Merged with lp:~codership/codership-mysql/5.5-23, up to revision 3903
Diffstat (limited to 'scripts/wsrep_sst_common.sh')
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index 44c97fdb5f4..30303de0779 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -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 } |