lp://staging/~ignacio-nin/percona-server/5.1-issue25867

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

478. By buildbot <buildbot@domU-12-31-39-01-A5-C1> on 2012-09-10

Move my_print_defaults to the client package in order not to conflict
with the mysql package from the centos repositories.

Have the shared package conflict with mysql-libs.
Have the server package require the client package.

477. By buildbot <buildbot@domU-12-31-39-01-A5-C1> on 2012-09-10

Remove Obsoletes: from the Percona Server packages.

This is done to prevent commands like "yum install mysql-libs" to want to
install Percona Server libraries instead.

476. By Ignacio Nin on 2012-09-05

Merge from trunk

Merging lp:percona-server/5.1 to the release branch prior to submitting
the MP to trunk, in order to avoid a criss-cross there.

475. By Ignacio Nin on 2012-08-31

Update buildscripts to 6.1.65-14.0

474. By Ignacio Nin on 2012-08-31

Merge changes for release 5.1.63-13-4

473. By Stewart Smith on 2012-08-24

merge fix for Bug #1039384: innodb_adaptive_flushing_method and innodb_flush_neighbor_pages partially broken

472. By Stewart Smith on 2012-08-23

merge fix for Bug #1036530: Sporadic innodb_plugin.percona_changed_page_bmp failures in Jenkins

471. By Stewart Smith on 2012-08-23

merge fix for Bug lp:1040483 UNIV_NONINL build broken

470. By Stewart Smith on 2012-08-23

merge HandlerSocket fix (fix is due to BZR having an odd bug checking out the repository)

469. By Stewart Smith on 2012-08-21

post merge fix: new DBUG_ASSERT() assertions in ha_innodb::clone() are incorrect. Confirmed by laurynas, pointing to revid:<email address hidden>