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 /support-files | |
| 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 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 5 | ||||
| -rw-r--r-- | support-files/wsrep.cnf.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index d40c96fad19..a1b32bdeed0 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -300,11 +300,14 @@ documentation and the manual for more information. %package -n MySQL-server%{product_suffix} %if %{defined with_wsrep} Version: %{mysql_version} -#Release: %{wsrep_version}.%{release} %endif Summary: MySQL: a very fast and reliable SQL database server Group: Applications/Databases +%if %{defined with_wsrep} +Requires: %{distro_requires} rsync +%else Requires: %{distro_requires} +%endif %if %{defined susever} Provides: msqlormysql MySQL MySQL-server Conflicts: mysql mysql-server mysql-advanced mysql-server-advanced diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh index 507f83324b9..756d4f6783b 100644 --- a/support-files/wsrep.cnf.sh +++ b/support-files/wsrep.cnf.sh @@ -108,7 +108,7 @@ wsrep_notify_cmd= ## # State Snapshot Transfer method -wsrep_sst_method=mysqldump +wsrep_sst_method=rsync # Address which donor should send State Snapshot to. # Should be the address of THIS node. DON'T SET IT TO DONOR ADDRESS!!! |