diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 11:34:57 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 11:34:57 +0300 |
| commit | 0892c7ec5d7bbca00e042047c4220e6830491c37 (patch) | |
| tree | 0fb649686d90bf6062f8db82106e6b2663727110 /support-files | |
| parent | 5f76c15a3b5c4f39370fe21764088ee88dab9f47 (diff) | |
| download | mariadb-git-0892c7ec5d7bbca00e042047c4220e6830491c37.tar.gz | |
References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk
patched with: bzr diff lp:codership-mysql/5.5 -r3779..3790
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 11 | ||||
| -rw-r--r-- | support-files/wsrep.cnf.sh | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 93222c1d3ac..f52fee5de61 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -30,7 +30,7 @@ %define mysqld_group mysql %define mysqldatadir /var/lib/mysql -%define release 2 +%define release 1 # # Macros we use which are not available in all supported versions of RPM @@ -73,9 +73,6 @@ %if %{defined with_wsrep} %define mysql_version @VERSION@_wsrep_@WSREP_API_VERSION@.@WSREP_PATCH_VERSION@ %define wsrep_version @WSREP_VERSION@ -%define wsrep_comment , wsrep_%{wsrep_version} -%else -%define wsrep_comment %{nil} %endif # ---------------------------------------------------------------------------- @@ -104,10 +101,10 @@ # Server comment strings # ---------------------------------------------------------------------------- %if %{undefined compilation_comment_debug} -%define compilation_comment_debug MySQL Community Server - Debug (GPL)%{wsrep_comment} +%define compilation_comment_debug MySQL Community Server - Debug (GPL) %endif %if %{undefined compilation_comment_release} -%define compilation_comment_release MySQL Community Server (GPL)%{wsrep_comment} +%define compilation_comment_release MySQL Community Server (GPL) %endif # ---------------------------------------------------------------------------- @@ -1098,9 +1095,11 @@ echo "=====" >> $STATUS_HISTORY %attr(755, root, root) %{_bindir}/resolve_stack_dump %attr(755, root, root) %{_bindir}/resolveip %if %{defined with_wsrep} +%attr(755, root, root) %{_bindir}/wsrep_sst_common %attr(755, root, root) %{_bindir}/wsrep_sst_mysqldump %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 %endif %attr(755, root, root) %{_sbindir}/mysqld diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh index c04e5ddaf43..507f83324b9 100644 --- a/support-files/wsrep.cnf.sh +++ b/support-files/wsrep.cnf.sh @@ -110,7 +110,8 @@ wsrep_notify_cmd= # State Snapshot Transfer method wsrep_sst_method=mysqldump -# Address on THIS node to receive SST at. DON'T SET IT TO DONOR ADDRESS!!! +# Address which donor should send State Snapshot to. +# Should be the address of THIS node. DON'T SET IT TO DONOR ADDRESS!!! # (SST method dependent. Defaults to the first IP of the first interface) #wsrep_sst_receive_address= |