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

Merge lp://staging/~tplavcic/percona-server/bug1174779-5.5 into lp://staging/percona-server/5.5

bug1174779-5.5
Merge into 5.5

Proposed by Tomislav Plavcic on 2014-03-12

Status:

Superseded

Proposed branch:

lp://staging/~tplavcic/percona-server/bug1174779-5.5

Merge into:

lp://staging/percona-server/5.5

Diff against target:

93 lines (+20/-7) (has conflicts)

4 files modified

Makefile-ps (+2/-2)
UDF/configure.ac (+1/-1)
build-ps/build-binary.sh (+14/-1)
build-ps/percona-server.spec (+3/-3)

Text conflict in build-ps/build-binary.sh

To merge this branch:

bzr merge lp://staging/~tplavcic/percona-server/bug1174779-5.5

Related bugs:

Bug #1174779: Percona Server sources referencing Maatkit should reference Percona Toolkit instead	Low	Fix Released
Bug #1272732: CFLAGS/CXXFLAGS used in our build scripts	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Laurynas Biveinis		2014-03-12	Pending
Review via email: mp+210706@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-03-06.

This proposal has been superseded by a proposal from 2014-03-28.

Description of the change

Replaced MaatKit with Percona Toolkit
Fixed build flags

Revision history for this message

Tomislav Plavcic (tplavcic) wrote on 2014-03-06: Posted in a previous version of this proposal

Made another proposal, just not sure I did it right so please check my workflow.

Revision history for this message

Laurynas Biveinis (laurynas-biveinis) wrote on 2014-03-07: Posted in a previous version of this proposal

It is not an upmerge from 5.1. If it were, the output below would be empty, and bzr merge ../bug1174779-5.1 would be a no-op.

Throughout all versions no need to link bug 1266387, as it's a duplicate of bug 1174779.

bug1174779-5.5$ bzr missing --theirs-only ../bug1174779-5.1/
You are missing 2 revisions:
------------------------------------------------------------
revno: 597 [merge]
committer: Tomislav Plavcic <email address hidden>
branch nick: 5.1
timestamp: Fri 2014-03-07 00:03:40 +0100
message:
  Merged with trunk
------------------------------------------------------------
revno: 596
committer: Tomislav Plavcic <email address hidden>
branch nick: 5.1
timestamp: Fri 2014-03-07 00:01:16 +0100
message:
  Replaced MaatKit with Percona Toolkit
  Updated compilation flags