lp:~laurynas-biveinis/percona-server/merge-5.5.42-bzr

Created by Laurynas Biveinis and last modified
Get this branch:
bzr branch lp:~laurynas-biveinis/percona-server/merge-5.5.42-bzr
Only Laurynas Biveinis can upload to this branch. If you are Laurynas Biveinis please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

733. By Laurynas Biveinis

Merge MySQL 5.5.42, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.5.42.

Since at the moment we haven't migrated to git yet, the merge was
performed by applying a diff produced by "git diff mysql-5.5.41
mysql-5.5.42".

Skip the following commits that assume git instead of bzr. These are
to be applied when we migrate to git.
https://github.com/mysql/mysql-server/commit/22d684dcc33c33873c7521c4b132c57b5080d9d4
https://github.com/mysql/mysql-server/commit/8e94f1282383b566845ccf63149556da18b115ab
https://github.com/mysql/mysql-server/commit/2ee7167bbd3cb630e497f4a955990e70e4c9c983

Do not apply:
https://github.com/mysql/mysql-server/commit/e7391e472e829eef0ce6c2b81a93508f73825f03

Work around http://bugs.mysql.com/bug.php?id=75868
(main.error_simulation fails on Mac OS X since 5.5.42) by marking the
testcase as Linux-only.

Import man pages from mysql-5.5.42.tar.gz.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:percona-server/5.6
This branch contains Public information 
Everyone can see this information.