Merge lp:~laurynas-biveinis/percona-server/5.6-merge-1-fixes into lp:percona-server/5.6
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Needs Resubmitting | ||
Percona core | 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_
disabled_
- Remove introduced-
- Fix Percona InnoDB version in univ.i.
- Remove obsolete UNIV_SRV_
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.