Merge lp://staging/~tplavcic/percona-server/bug1174779-5.6 into lp://staging/percona-server/5.6
Proposed by
Tomislav Plavcic
| Status: | Merged |
|---|---|
| Approved by: | Laurynas Biveinis |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 574 |
| Proposed branch: | lp://staging/~tplavcic/percona-server/bug1174779-5.6 |
| Merge into: | lp://staging/percona-server/5.6 |
| Diff against target: |
76 lines (+7/-9) 4 files modified
Makefile-ps (+2/-2) UDF/configure.ac (+1/-1) build-ps/build-binary.sh (+1/-3) build-ps/percona-server.spec (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~tplavcic/percona-server/bug1174779-5.6 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Laurynas Biveinis (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-03-12.
Description of the change
Replaced MaatKit with Percona Toolkit
Fixed build flags
Discussed this with Laurynas over mail and it seems like I've forgot to resubmit MP.
Param build for 5.6 was:
https:/
To post a comment you must log in.
Revision history for this message
| Laurynas Biveinis (laurynas-biveinis) wrote | # |
review:
Needs Fixing
Revision history for this message
| Tomislav Plavcic (tplavcic) wrote | # |
Revision history for this message
| Laurynas Biveinis (laurynas-biveinis) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Needs rebasing on the current trunk to resolve the conflicts.
(the lower versions have conflicts too, you can try rebasing those branches as well, as GCA revision has advanced yesterday, but the conflicts there might be unavoidable for a GCA rev and will have to be resolved during the merge to trunk).