Merge lp://staging/~percona-core/percona-xtradb-cluster/bug-1405668-5.6 into lp://staging/percona-xtradb-cluster

Proposed by Raghavendra D Prabhu
Status: Merged
Approved by: Alexey Kopytov
Approved revision: 950
Merge reported by: Raghavendra D Prabhu
Merged at revision: not available
Proposed branch: lp://staging/~percona-core/percona-xtradb-cluster/bug-1405668-5.6
Merge into: lp://staging/percona-xtradb-cluster
Diff against target: 290 lines (+64/-99)
3 files modified
percona-xtradb-cluster-tests/conf/conf20.cnf-node1 (+1/-1)
percona-xtradb-cluster-tests/conf/conf20.cnf-node2 (+1/-1)
scripts/wsrep_sst_xtrabackup-v2.sh (+62/-97)
To merge this branch: bzr merge lp://staging/~percona-core/percona-xtradb-cluster/bug-1405668-5.6
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Raghavendra D Prabhu (community) Approve
Review via email: mp+245519@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) wrote :

I had to create a local clone of lp:~percona-core/percona-xtradb-cluster/bug-1405668-5.6 to see the actual changes.

This is the last revision I see in that branch:
---
revno: 949
committer: Raghavendra D Prabhu <email address hidden>
branch nick: bug-1405668-5.6
timestamp: Fri 2014-12-26 05:02:29 +0530
message:
  Fix the cpat for conf20 test
---

I'm not sure that revision is supposed to fix bug #1405668. Something probably went wrong.

review: Needs Resubmitting
Revision history for this message
Alexey Kopytov (akopytov) wrote :

Also, will there be a fix for 5.5?

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

This will not be fixed for 5.5.

Regarding 949, that was a fix in percona-xtradb-cluster-tests that I made.(since it is related)

Revision history for this message
Alexey Kopytov (akopytov) wrote :

I'm lost in these bugs. So this MP is supposed to fix bug #1405668. Which is not going to be fixed in 5.5.

But the revision I see in this MP doesn't mention bug #1405668. It mentions only bug #1405985. Which _is_ going to be fixed in 5.5.

Also there's a linked bug #1407599. Which is also going to be fixed in 5.5, but it's not mentioned in revision comments (only the fix itself is explained).

Can we have one revision, one MP per branch/bug rule? It gets a bit confusing and hard to track otherwise.

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

> Also there's a linked bug #1407599. Which is also going to be fixed in 5.5, but it's not mentioned in revision comments (only the fix itself is explained).

The commit message has been fixed to include this in bug subject. Its 5.5 MP is
here
https://code.launchpad.net/~percona-core/percona-xtradb-cluster/bug-1405668-5.5/+merge/247762

> I'm lost in these bugs. So this MP is supposed to fix bug #1405668. Which is
> not going to be fixed in 5.5.

That is correct. I have now added 5.5 to the bug, and will submit separate MP
for it.

> But the revision I see in this MP doesn't mention bug #1405668. It mentions
> only bug #1405985. Which _is_ going to be fixed in 5.5.

The revision 946 mentions it.

Anyway, same MP is used for 3 bugs since they all modify the same file (and the
only file) and are related.

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

Fixed.

Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) :
review: Approve
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: