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
1=== modified file 'Percona-Server/cmake/wsrep.cmake'
2--- Percona-Server/cmake/wsrep.cmake 2013-02-06 17:19:28 +0000
3+++ Percona-Server/cmake/wsrep.cmake 2013-03-25 17:22:01 +0000
4@@ -17,7 +17,7 @@
5 # so WSREP_VERSION is produced regardless
6
7 # Set the patch version
8-SET(WSREP_PATCH_VERSION "7.1")
9+SET(WSREP_PATCH_VERSION "7.2")
10
11 # Obtain patch revision number
12 SET(WSREP_PATCH_REVNO $ENV{WSREP_REV})
13
14=== modified file 'build/percona-xtradb-cluster.spec'
15--- build/percona-xtradb-cluster.spec 2013-01-25 01:53:12 +0000
16+++ build/percona-xtradb-cluster.spec 2013-03-25 17:22:01 +0000
17@@ -265,7 +265,7 @@
18 Group: Applications/Databases
19 Requires: %{distro_requires} mysql-libs Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync
20 Provides: mysql-server MySQL-server Percona-Server-server
21-Conflicts: Percona-Server-server-55 Percona-Server-server-51 mysql-server
22+Conflicts: Percona-Server-server-55 Percona-Server-server-51
23
24 %description -n Percona-XtraDB-Cluster-server%{product_suffix}
25 Percona XtraDB Cluster is based on the Percona Server database server and
26@@ -290,7 +290,7 @@
27 Group: Applications/Databases
28 Requires: mysql-libs
29 Provides: mysql-client MySQL-client mysql MySQL Percona-XtraDB-Cluster-client
30-Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50 mysql
31+Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50
32
33 %description -n Percona-XtraDB-Cluster-client%{product_suffix}
34 Percona XtraDB Cluster is based on the Percona Server database server and
35@@ -314,7 +314,7 @@
36 Summary: Percona XtraDB Cluster - Test suite
37 Group: Applications/Databases
38 Provides: mysql-test Percona-Server-test
39-Conflicts: Percona-Server-test-55 Percona-Server-test-51 mysql-test
40+Conflicts: Percona-Server-test-55 Percona-Server-test-51
41 AutoReqProv: no
42
43 %description -n Percona-XtraDB-Cluster-test%{product_suffix}
44@@ -338,7 +338,7 @@
45 Summary: Percona XtraDB Cluster - Development header files and libraries
46 Group: Applications/Databases
47 Provides: mysql-devel Percona-Server-devel
48-Conflicts: Percona-Server-devel-55 Percona-Server-devel-51 mysql-devel
49+Conflicts: Percona-Server-devel-55 Percona-Server-devel-51
50
51 %description -n Percona-XtraDB-Cluster-devel%{product_suffix}
52 Percona XtraDB Cluster is based on the Percona Server database server and
53@@ -362,7 +362,7 @@
54 Summary: Percona XtraDB Cluster - Shared libraries
55 Group: Applications/Databases
56 Provides: mysql-shared mysql-libs Percona-Server-shared
57-Conflicts: Percona-Server-shared-55 Percona-Server-shared-51 mysql-libs
58+Conflicts: Percona-Server-shared-55 Percona-Server-shared-51
59
60 %description -n Percona-XtraDB-Cluster-shared%{product_suffix}
61 Percona XtraDB Cluster is based on the Percona Server database server and

Subscribers

People subscribed via source and target branches

to all changes: