Merging revision 3839..3932 from codership-mysql/5.5.

This commit is contained in:
Nirbhay Choubey 2014-01-09 14:54:57 -05:00
commit 31eaa90a6e
53 changed files with 3222 additions and 2267 deletions

View file

@ -24,7 +24,7 @@
# my_print_defaults to extract values from my.cnf. #
# netcat for transfer. #
# xbstream/tar for streaming. (and xtrabackup ofc) #
# #
# #
# Currently only option in cnf is read specifically for SST #
# [sst] #
# streamfmt=tar|xbstream #
@ -362,8 +362,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