summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorJan Lindström <jplindst@mariadb.org>2014-04-16 13:08:29 +0300
committerJan Lindström <jplindst@mariadb.org>2014-04-16 13:08:29 +0300
commitfa18dc394406ad684ab2623e7451c9f3ec7adf08 (patch)
tree6b708eaa3b970ee14451c2ffdd5d89c7d8dce0dd /support-files
parent150e88e8c9b85e3e6ce500a91fd215d231e99881 (diff)
downloadmariadb-git-fa18dc394406ad684ab2623e7451c9f3ec7adf08.tar.gz
Merge lp:codership-mysql/5.5 -r3961..3980.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh1
-rw-r--r--support-files/wsrep_notify.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 189d4bacc0e..c03763c7d45 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -1207,6 +1207,7 @@ echo "=====" >> $STATUS_HISTORY
%attr(755, root, root) %{_bindir}/wsrep_sst_rsync
%attr(755, root, root) %{_bindir}/wsrep_sst_rsync_wan
%attr(755, root, root) %{_bindir}/wsrep_sst_xtrabackup
+%attr(755, root, root) %{_bindir}/wsrep_sst_xtrabackup-v2
%endif
%attr(755, root, root) %{_sbindir}/mysqld
diff --git a/support-files/wsrep_notify.sh b/support-files/wsrep_notify.sh
index bdbe3d12a39..c36a9ddc62a 100644
--- a/support-files/wsrep_notify.sh
+++ b/support-files/wsrep_notify.sh
@@ -87,6 +87,7 @@ do
--members)
MEMBERS=$2
shift
+ fi
;;
esac
shift