Created by Ignacio Nin and last modified
Get this branch:
bzr branch lp:~ignacio-nin/percona-server/5.6-bug1167109
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

331. By Ignacio Nin

Conflict with Percona Server 5.0/5.1/5.5 RPMs

The server package conflicts at the file level with the server packages from
5.0, 5.1 and 5.5, however it's not declared in Conflicts:, so yum tries to
install it anyway if asked to, resulting in a conflict when running the
transaction and a messy error output.

Declare the 5.0/5.1/5.5 packages as conflicting in Conflicts: for each package,
so yum doesn't try to install it.

Also declare the shared package to conflict with the 5.5 shared package, since
these use the same version (.so.18) of the library and are incompatible. This
doesn't happen between other versions of Percona-Server for this package.

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

322. By <email address hidden>

Merge lp:~gl-az/percona-server/ST-29716-bug1135097-5.6

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.