Merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1167109 into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

Proposed by Ignacio Nin
Status: Merged
Approved by: Raghavendra D Prabhu
Approved revision: no longer in the source branch.
Merged at revision: 388
Proposed branch: lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1167109
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Diff against target: 39 lines (+4/-4)
1 file modified
build/percona-xtradb-cluster.spec (+4/-4)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/pxc-bug1167109
Reviewer Review Type Date Requested Status
Percona core Pending
Review via email: mp+166374@code.launchpad.net

Description of the change

Fix for the PXC version of bug #1167109

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 'build/percona-xtradb-cluster.spec'
2--- build/percona-xtradb-cluster.spec 2013-04-23 05:19:16 +0000
3+++ build/percona-xtradb-cluster.spec 2013-05-29 19:57:37 +0000
4@@ -267,7 +267,7 @@
5 Group: Applications/Databases
6 Requires: %{distro_requires} Percona-XtraDB-Cluster-client%{product_suffix} Percona-XtraDB-Cluster-shared%{product_suffix} Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync
7 Provides: mysql-server MySQL-server Percona-Server-server
8-Conflicts: Percona-Server-server-55 Percona-Server-server-51
9+Conflicts: Percona-Server-server-56 Percona-Server-server-55 Percona-Server-server-51 Percona-SQL-server-50
10
11 %description -n Percona-XtraDB-Cluster-server%{product_suffix}
12 Percona XtraDB Cluster is based on the Percona Server database server and
13@@ -292,7 +292,7 @@
14 Group: Applications/Databases
15 Requires: Percona-XtraDB-Cluster-shared%{product_suffix}
16 Provides: mysql-client MySQL-client mysql MySQL Percona-XtraDB-Cluster-client
17-Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50
18+Conflicts: Percona-Server-client-56 Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50
19
20 %description -n Percona-XtraDB-Cluster-client%{product_suffix}
21 Percona XtraDB Cluster is based on the Percona Server database server and
22@@ -316,7 +316,7 @@
23 Summary: Percona XtraDB Cluster - Test suite
24 Group: Applications/Databases
25 Provides: mysql-test Percona-Server-test
26-Conflicts: Percona-Server-test-55 Percona-Server-test-51
27+Conflicts: Percona-Server-test-56 Percona-Server-test-55 Percona-Server-test-51
28 AutoReqProv: no
29
30 %description -n Percona-XtraDB-Cluster-test%{product_suffix}
31@@ -340,7 +340,7 @@
32 Summary: Percona XtraDB Cluster - Development header files and libraries
33 Group: Applications/Databases
34 Provides: mysql-devel Percona-Server-devel
35-Conflicts: Percona-Server-devel-55 Percona-Server-devel-51
36+Conflicts: Percona-Server-devel-56 Percona-Server-devel-55 Percona-Server-devel-51 Percona-SQL-devel-50
37
38 %description -n Percona-XtraDB-Cluster-devel%{product_suffix}
39 Percona XtraDB Cluster is based on the Percona Server database server and

Subscribers

People subscribed via source and target branches

to all changes: