Merge lp:~ignacio-nin/percona-xtradb-cluster/5.5.29-nonconflicting-libmysqlclient into lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5

Proposed by Ignacio Nin
Status: Superseded
Proposed branch: lp:~ignacio-nin/percona-xtradb-cluster/5.5.29-nonconflicting-libmysqlclient
Merge into: lp:percona-xtradb-cluster/percona-xtradb-cluster-5.5
Diff against target: 98 lines (+14/-9)
3 files modified
Percona-Server/cmake/wsrep.cmake (+1/-1)
build/percona-shared-compat.spec (+4/-0)
build/percona-xtradb-cluster.spec (+9/-8)
To merge this branch: bzr merge lp:~ignacio-nin/percona-xtradb-cluster/5.5.29-nonconflicting-libmysqlclient
Reviewer Review Type Date Requested Status
Raghavendra D Prabhu (community) Needs Fixing
Review via email: mp+152545@code.launchpad.net

This proposal has been superseded by a proposal from 2013-03-25.

Description of the change

Changes for solving the RPM shared packages related bugs.

This works together with lp:~ignacio-nin/percona-server/5.0-nonconflicting-libmysqlclient, lp:~ignacio-nin/percona-server/5.1-nonconflicting-libmysqlclient and lp:~ignacio-nin/percona-server/5.5-nonconflicting-libmysqlclient for the products becoming compatible when installing the percona-server-shared package.

To post a comment you must log in.
Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

I don't think

-SET(WSREP_PATCH_VERSION "7.1")
+SET(WSREP_PATCH_VERSION "7.2")

should be part of this patch since it is bumped upstream. (and it is 7.3 now).

review: Needs Fixing
Revision history for this message
Ignacio Nin (ignacio-nin) wrote :

> I don't think
>
> -SET(WSREP_PATCH_VERSION "7.1")
> +SET(WSREP_PATCH_VERSION "7.2")
>
> should be part of this patch since it is bumped upstream. (and it is 7.3 now).

Right now in the target branch Percona-Server/cmake/wsrep.cmake contains 7.1. Also, what's upstream in this context?

Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

In the upstream file it is 7.3, ie.

SET(WSREP_PATCH_VERSION "7.3")

Unmerged revisions

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-09 01:32:24 +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-shared-compat.spec'
15--- build/percona-shared-compat.spec 2013-01-22 16:19:45 +0000
16+++ build/percona-shared-compat.spec 2013-03-09 01:32:24 +0000
17@@ -47,7 +47,11 @@
18 Version: %{version55}
19 Release: %{release}.%{gotrevision}.rhel%{redhatversion}
20 BuildRoot: %{_tmppath}/%{name}-%{version}-build
21+%if "%{redhatversion}" == "5"
22+Obsoletes: MySQL-shared mysql
23+%else
24 Obsoletes: MySQL-shared mysql-libs
25+%endif
26 Provides: MySQL-shared mysql-libs
27 Summary: MySQL shared client libraries for MySQL %{version}, %{version50}, %{version41} and %{version40}
28
29
30=== modified file 'build/percona-xtradb-cluster.spec'
31--- build/percona-xtradb-cluster.spec 2013-01-25 01:53:12 +0000
32+++ build/percona-xtradb-cluster.spec 2013-03-09 01:32:24 +0000
33@@ -263,9 +263,9 @@
34 %package -n Percona-XtraDB-Cluster-server%{product_suffix}
35 Summary: Percona XtraDB Cluster - server package
36 Group: Applications/Databases
37-Requires: %{distro_requires} mysql-libs Percona-XtraDB-Cluster-galera%{product_suffix} xtrabackup >= 1.9.0 tar nc rsync
38+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
39 Provides: mysql-server MySQL-server Percona-Server-server
40-Conflicts: Percona-Server-server-55 Percona-Server-server-51 mysql-server
41+Conflicts: Percona-Server-server-55 Percona-Server-server-51
42
43 %description -n Percona-XtraDB-Cluster-server%{product_suffix}
44 Percona XtraDB Cluster is based on the Percona Server database server and
45@@ -288,9 +288,9 @@
46 %package -n Percona-XtraDB-Cluster-client%{product_suffix}
47 Summary: Percona XtraDB Cluster - client package
48 Group: Applications/Databases
49-Requires: mysql-libs
50+Requires: Percona-XtraDB-Cluster-shared%{product_suffix}
51 Provides: mysql-client MySQL-client mysql MySQL Percona-XtraDB-Cluster-client
52-Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50 mysql
53+Conflicts: Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50
54
55 %description -n Percona-XtraDB-Cluster-client%{product_suffix}
56 Percona XtraDB Cluster is based on the Percona Server database server and
57@@ -314,7 +314,7 @@
58 Summary: Percona XtraDB Cluster - Test suite
59 Group: Applications/Databases
60 Provides: mysql-test Percona-Server-test
61-Conflicts: Percona-Server-test-55 Percona-Server-test-51 mysql-test
62+Conflicts: Percona-Server-test-55 Percona-Server-test-51
63 AutoReqProv: no
64
65 %description -n Percona-XtraDB-Cluster-test%{product_suffix}
66@@ -338,7 +338,7 @@
67 Summary: Percona XtraDB Cluster - Development header files and libraries
68 Group: Applications/Databases
69 Provides: mysql-devel Percona-Server-devel
70-Conflicts: Percona-Server-devel-55 Percona-Server-devel-51 mysql-devel
71+Conflicts: Percona-Server-devel-55 Percona-Server-devel-51
72
73 %description -n Percona-XtraDB-Cluster-devel%{product_suffix}
74 Percona XtraDB Cluster is based on the Percona Server database server and
75@@ -362,7 +362,7 @@
76 Summary: Percona XtraDB Cluster - Shared libraries
77 Group: Applications/Databases
78 Provides: mysql-shared mysql-libs Percona-Server-shared
79-Conflicts: Percona-Server-shared-55 Percona-Server-shared-51 mysql-libs
80+Conflicts: Percona-Server-shared-55
81
82 %description -n Percona-XtraDB-Cluster-shared%{product_suffix}
83 Percona XtraDB Cluster is based on the Percona Server database server and
84@@ -1168,12 +1168,13 @@
85 %{_libdir}/mysql/libmysqlservices.a
86 %{_libdir}/mysql/libhsclient.a
87 %{_libdir}/libhsclient.la
88+%{_libdir}/*.so
89
90 # ----------------------------------------------------------------------------
91 %files -n Percona-XtraDB-Cluster-shared%{product_suffix}
92 %defattr(-, root, root, 0755)
93 # Shared libraries (omit for architectures that don't support them)
94-%{_libdir}/libmysql*.so*
95+%{_libdir}/libmysql*.so.*
96 # Maatkit UDF libs
97 %{_libdir}/mysql/plugin/libfnv1a_udf.a
98 %{_libdir}/mysql/plugin/libfnv1a_udf.la

Subscribers

People subscribed via source and target branches

to all changes: