Created by Ignacio Nin and last modified
Get this branch:
bzr branch lp:~ignacio-nin/percona-server/5.6-bug1165098
Only Ignacio Nin can upload to this branch. If you are Ignacio Nin please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Recent revisions

333. By Ignacio Nin

Merge from trunk in order to solve further conflicts

332. By Ignacio Nin

Reconcile changes from lp:~roel11/percona-server/bug-1144059-5.6

Reconcile changes from said branch, which also affect files in build/,
to this branch.

331. By Ignacio Nin

Merge changes from release 5.6.10-60.2

These changes alter some of the files affected by the #1165098, leading
to conflicts with the previous commit. Merge from the release so we can
solve these.

330. By Ignacio Nin

Re-add files under the build/ directory with matching file-id from 5.5

The directories build/, build/debian/ and some files under these were
added with a different file-id from the same files in the 5.5 branch,
leading to merging issues when merging from 5.5.

Readd these files with the correct file-ids to solve this.

Also remove the shared-compat files which are no longer useful in 5.6 and
were leftovers from the 5.5 files port.

326. By <email address hidden>

Merge lp:~sergei.glushchenko/percona-server/ps56-univ-log-archive

325. By <email address hidden>

Merge lp:~sergei.glushchenko/percona-server/56-bug1133926

324. By <email address hidden>

Merge lp:~sergei.glushchenko/percona-server/56-bug1157078-bug1157075

Branch metadata

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