diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 11:12:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 11:12:38 -0400 |
| commit | b5871a51e99f2d591e944590f2e2332275064d07 (patch) | |
| tree | e27d70c77ad6cd9f399c6063899c0d3d6d2735c6 /scripts/wsrep_sst_xtrabackup.sh | |
| parent | 7d892f69a565e583eb692d01e2e80a158ee795fe (diff) | |
| download | mariadb-git-b5871a51e99f2d591e944590f2e2332275064d07.tar.gz | |
* bzr merge -r4027..4061 codership/5.6
* Merged Innodb changes to xtradb
Diffstat (limited to 'scripts/wsrep_sst_xtrabackup.sh')
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh index 3948b15c53b..33f2f07946e 100644 --- a/scripts/wsrep_sst_xtrabackup.sh +++ b/scripts/wsrep_sst_xtrabackup.sh @@ -38,6 +38,8 @@ # Make sure to read that before proceeding! + + . $(dirname $0)/wsrep_sst_common ealgo="" @@ -609,8 +611,6 @@ then if [[ $ecode -ne 0 ]];then wsrep_log_error "Error while getting data from donor node: " \ "exit codes: ${RC[@]}" - wsrep_log_error "Data directory ${DATA} needs to be empty for SST:" \ - "Manual intervention required in that case" exit 32 fi done |