Merge lp:~percona-core/percona-xtradb-cluster/release-5.5.29 into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

Proposed by Ignacio Nin
Status: Merged
Merged at revision: 387
Proposed branch: lp:~percona-core/percona-xtradb-cluster/release-5.5.29
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Diff against target: 61 lines (+6/-6)
2 files modified
Percona-Server/cmake/wsrep.cmake (+1/-1)
build/percona-xtradb-cluster.spec (+5/-5)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/release-5.5.29
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+155293@code.launchpad.net

Description of the change

Changes for release 5.5.29-7.2

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/cmake/wsrep.cmake'
--- Percona-Server/cmake/wsrep.cmake 2013-02-06 17:19:28 +0000
+++ Percona-Server/cmake/wsrep.cmake 2013-03-25 17:22:01 +0000
@@ -17,7 +17,7 @@
17# so WSREP_VERSION is produced regardless17# so WSREP_VERSION is produced regardless
1818
19# Set the patch version19# Set the patch version
20SET(WSREP_PATCH_VERSION "7.1")20SET(WSREP_PATCH_VERSION "7.2")
2121
22# Obtain patch revision number22# Obtain patch revision number
23SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})23SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
2424
=== modified file 'build/percona-xtradb-cluster.spec'
--- build/percona-xtradb-cluster.spec 2013-01-25 01:53:12 +0000
+++ build/percona-xtradb-cluster.spec 2013-03-25 17:22:01 +0000
@@ -265,7 +265,7 @@
265Group: Applications/Databases265Group: Applications/Databases
266Requires: %{distro_requires} mysql-libs Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync266Requires: %{distro_requires} mysql-libs Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync
267Provides: mysql-server MySQL-server Percona-Server-server267Provides: mysql-server MySQL-server Percona-Server-server
268Conflicts: Percona-Server-server-55 Percona-Server-server-51 mysql-server268Conflicts: Percona-Server-server-55 Percona-Server-server-51
269269
270%description -n Percona-XtraDB-Cluster-server%{product_suffix}270%description -n Percona-XtraDB-Cluster-server%{product_suffix}
271Percona XtraDB Cluster is based on the Percona Server database server and271Percona XtraDB Cluster is based on the Percona Server database server and
@@ -290,7 +290,7 @@
290Group: Applications/Databases290Group: Applications/Databases
291Requires: mysql-libs291Requires: mysql-libs
292Provides: mysql-client MySQL-client mysql MySQL Percona-XtraDB-Cluster-client292Provides: mysql-client MySQL-client mysql MySQL Percona-XtraDB-Cluster-client
293Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50 mysql293Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50
294294
295%description -n Percona-XtraDB-Cluster-client%{product_suffix}295%description -n Percona-XtraDB-Cluster-client%{product_suffix}
296Percona XtraDB Cluster is based on the Percona Server database server and296Percona XtraDB Cluster is based on the Percona Server database server and
@@ -314,7 +314,7 @@
314Summary: Percona XtraDB Cluster - Test suite314Summary: Percona XtraDB Cluster - Test suite
315Group: Applications/Databases315Group: Applications/Databases
316Provides: mysql-test Percona-Server-test316Provides: mysql-test Percona-Server-test
317Conflicts: Percona-Server-test-55 Percona-Server-test-51 mysql-test317Conflicts: Percona-Server-test-55 Percona-Server-test-51
318AutoReqProv: no318AutoReqProv: no
319319
320%description -n Percona-XtraDB-Cluster-test%{product_suffix}320%description -n Percona-XtraDB-Cluster-test%{product_suffix}
@@ -338,7 +338,7 @@
338Summary: Percona XtraDB Cluster - Development header files and libraries338Summary: Percona XtraDB Cluster - Development header files and libraries
339Group: Applications/Databases339Group: Applications/Databases
340Provides: mysql-devel Percona-Server-devel340Provides: mysql-devel Percona-Server-devel
341Conflicts: Percona-Server-devel-55 Percona-Server-devel-51 mysql-devel341Conflicts: Percona-Server-devel-55 Percona-Server-devel-51
342342
343%description -n Percona-XtraDB-Cluster-devel%{product_suffix}343%description -n Percona-XtraDB-Cluster-devel%{product_suffix}
344Percona XtraDB Cluster is based on the Percona Server database server and344Percona XtraDB Cluster is based on the Percona Server database server and
@@ -362,7 +362,7 @@
362Summary: Percona XtraDB Cluster - Shared libraries362Summary: Percona XtraDB Cluster - Shared libraries
363Group: Applications/Databases363Group: Applications/Databases
364Provides: mysql-shared mysql-libs Percona-Server-shared364Provides: mysql-shared mysql-libs Percona-Server-shared
365Conflicts: Percona-Server-shared-55 Percona-Server-shared-51 mysql-libs365Conflicts: Percona-Server-shared-55 Percona-Server-shared-51
366366
367%description -n Percona-XtraDB-Cluster-shared%{product_suffix}367%description -n Percona-XtraDB-Cluster-shared%{product_suffix}
368Percona XtraDB Cluster is based on the Percona Server database server and368Percona XtraDB Cluster is based on the Percona Server database server and

Subscribers

People subscribed via source and target branches

to all changes: