Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~ignacio-nin/percona-server/5.6-bug1167109 into lp:percona-server/5.6

  1. 5.6-bug1167109
  2. Merge into 5.6
Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 338
Proposed branch: lp:~ignacio-nin/percona-server/5.6-bug1167109
Merge into: lp:percona-server/5.6
Prerequisite: lp:~ignacio-nin/percona-server/5.6-bug1165098
Diff against target: 43 lines (+5/-0) (has conflicts)
1 file modified
build/percona-server.spec (+5/-0)
Path conflict: <deleted> / build/debian/docs
Conflict: can't delete build.moved because it is not empty.  Not deleting.
Conflict adding file build.  Moved existing file to build.moved.
Conflict because build.moved is not versioned, but has versioned children.  Versioned directory.
Path conflict: build.moved/build-binary.sh / build/build-binary.sh
Path conflict: build.moved/build-dpkg.sh / build/build-dpkg.sh
Path conflict: build.moved/build-rpm.sh / build/build-rpm.sh
Conflict: can't delete build.moved/debian because it is not empty.  Not deleting.
Conflict because build.moved/debian is not versioned, but has versioned children.  Versioned directory.
To merge this branch: bzr merge lp:~ignacio-nin/percona-server/5.6-bug1167109
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+158144@code.launchpad.net

Description of the change

Fix for bug #1167109, on top of the file-ids fix

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote :

The patch is OK, the path conflicts are suspicious but should have been resolved at the prerequisite branch, will need checking at the merge time.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/percona-server.spec'
--- build/percona-server.spec 2013-04-10 15:09:42 +0000
+++ build/percona-server.spec 2013-04-10 15:09:43 +0000
@@ -258,6 +258,7 @@
258Group: Applications/Databases258Group: Applications/Databases
259Requires: %{distro_requires} Percona-Server-shared%{product_suffix}259Requires: %{distro_requires} Percona-Server-shared%{product_suffix}
260Provides: mysql-server MySQL-server260Provides: mysql-server MySQL-server
261Conflicts: Percona-SQL-server-50 Percona-Server-server-51 Percona-Server-server-55
261262
262%description -n Percona-Server-server%{product_suffix}263%description -n Percona-Server-server%{product_suffix}
263The Percona Server software delivers a very fast, multi-threaded, multi-user,264The Percona Server software delivers a very fast, multi-threaded, multi-user,
@@ -280,6 +281,7 @@
280Group: Applications/Databases281Group: Applications/Databases
281Requires: Percona-Server-shared%{product_suffix}282Requires: Percona-Server-shared%{product_suffix}
282Provides: mysql-client MySQL-client mysql MySQL283Provides: mysql-client MySQL-client mysql MySQL
284Conflicts: Percona-SQL-client-50 Percona-Server-client-51 Percona-Server-client-55
283285
284%description -n Percona-Server-client%{product_suffix}286%description -n Percona-Server-client%{product_suffix}
285This package contains the standard Percona Server client and administration tools.287This package contains the standard Percona Server client and administration tools.
@@ -292,6 +294,7 @@
292Summary: Percona Server - Test suite294Summary: Percona Server - Test suite
293Group: Applications/Databases295Group: Applications/Databases
294Provides: mysql-test296Provides: mysql-test
297Conflicts: Percona-SQL-test-50 Percona-Server-test-51 Percona-Server-test-55
295AutoReqProv: no298AutoReqProv: no
296299
297%description -n Percona-Server-test%{product_suffix}300%description -n Percona-Server-test%{product_suffix}
@@ -304,6 +307,7 @@
304Summary: Percona Server - Development header files and libraries307Summary: Percona Server - Development header files and libraries
305Group: Applications/Databases308Group: Applications/Databases
306Provides: mysql-devel309Provides: mysql-devel
310Conflicts: Percona-SQL-devel-50 Percona-Server-devel-51 Percona-Server-devel-55
307311
308%description -n Percona-Server-devel%{product_suffix}312%description -n Percona-Server-devel%{product_suffix}
309This package contains the development header files and libraries necessary313This package contains the development header files and libraries necessary
@@ -316,6 +320,7 @@
316Summary: Percona Server - Shared libraries320Summary: Percona Server - Shared libraries
317Group: Applications/Databases321Group: Applications/Databases
318Provides: mysql-shared322Provides: mysql-shared
323Conflicts: Percona-Server-shared-55
319324
320%description -n Percona-Server-shared%{product_suffix}325%description -n Percona-Server-shared%{product_suffix}
321This package contains the shared libraries (*.so*) which certain languages326This package contains the shared libraries (*.so*) which certain languages

Subscribers

People subscribed via source and target branches