Merge lp:~laurynas-biveinis/percona-server/5.6-merge-1-fixes into lp:percona-server/5.6

Proposed by Laurynas Biveinis on 2013-05-20
Status: Superseded
Proposed branch: lp:~laurynas-biveinis/percona-server/5.6-merge-1-fixes
Merge into: lp:percona-server/5.6
Prerequisite: lp:~laurynas-biveinis/percona-server/5.6-merge-1
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/5.6-merge-1-fixes
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2013-05-20 Resubmit on 2013-05-21
Percona core 2013-05-20 Pending
Review via email: mp+164735@code.launchpad.net

This proposal has been superseded by a proposal from 2013-05-21.

Description of the change

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Revert the spurious copyright comment changes, so that they match
  the ones at the current lp:mysql-server/5.6. Do not touch the ones
  that are fixed in the subsequent 5.6.11 merge.

- Revert the change introduced at the porting where SHOW SLAVE STATUS
  would check whether the slave is running, and returning
  WARN_NO_MASTER_INFO warning if it's not. Re-record
  disabled_replication test to match.

- Remove introduced-by-mistake debugging printf()s in sys_vars.h.

- Fix Percona InnoDB version in univ.i.

- Remove obsolete UNIV_SRV_PRINT_LATCH_WAITS code.

To post a comment you must log in.

Local test and long and a hard stare at the diff instead of Jenkins. http://jenkins.percona.com/job/percona-server-5.6-param/107/ could be checked in a week's or so time though.

Alexey Kopytov (akopytov) wrote :

Jenkins test failures. Will be resubmitted as discussed on IRC.

review: Resubmit
349. By Laurynas Biveinis on 2013-05-22

Automerge lp:~laurynas-biveinis/percona-server/5.6-merge-1

350. By Laurynas Biveinis on 2013-05-22

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Revert the spurious copyright comment changes, so that they match
  the ones at the current lp:mysql-server/5.6. Do not touch the ones
  that are fixed in the subsequent 5.6.11 merge.

351. By Laurynas Biveinis on 2013-05-22

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Revert the change introduced at the porting where SHOW SLAVE STATUS
  would check whether the slave is running, and returning
  WARN_NO_MASTER_INFO warning if it's not. Re-record
  disabled_replication test to match.

352. By Laurynas Biveinis on 2013-05-22

Post-review fixes for the lp:percona-server/5.5 rev 397 merge to
lp:percona-server/5.6.

- Remove introduced-by-mistake debugging printf()s in sys_vars.h.

- Fix Percona InnoDB version in univ.i.

- Remove obsolete UNIV_SRV_PRINT_LATCH_WAITS code.

Unmerged revisions

Diff calculation failed

Calculating the branch diff failed. You can manually schedule an update if required.

Subscribers

People subscribed via source and target branches