lp:~stewart/percona-server/5.5-psclient

Branch merges

Propose for merging

Merged into lp:percona-server/5.5 at revision 615

Laurynas Biveinis (community): Approve on 2013-12-27

Percona core: Pending requested 2013-12-23

Alexey Bychko: Pending requested 2013-12-23

Diff: 744 lines (+111/-81) (has conflicts)

35 files modified

Percona-Server/.bzrignore (+6/-6)
Percona-Server/client/CMakeLists.txt (+11/-11)
Percona-Server/libmysql/CMakeLists.txt (+14/-10)
Percona-Server/libmysql/libmysql.map (+3/-3)
Percona-Server/libmysql/libmysql.ver.in (+1/-1)
Percona-Server/man/mysql_config.1 (+8/-1)
Percona-Server/packaging/rpm-uln/mysql.spec.sh (+5/-5)
Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+1/-1)
Percona-Server/scripts/CMakeLists.txt (+2/-2)
Percona-Server/scripts/mysql_config.pl.in (+3/-3)
Percona-Server/scripts/mysql_config.sh (+2/-2)
Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_async1/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_event/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_retries/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_scan/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_dual/Makefile (+1/-1)
Percona-Server/storage/ndb/ndbapi-examples/ndbapi_simple_index/Makefile (+1/-1)
Percona-Server/storage/ndb/test/ndbapi/Makefile.am (+2/-2)
Percona-Server/support-files/MySQL-shared-compat.spec.sh (+1/-1)
Percona-Server/support-files/mysql.spec.sh (+3/-3)
Percona-Server/tests/CMakeLists.txt (+2/-2)
build/debian/control (+18/-3)
build/debian/libmysqlclient18-dev.install (+2/-2)
build/debian/libmysqlclient18-dev.links (+2/-2)
build/debian/libmysqlclient18.install (+4/-0)
build/percona-server.spec (+3/-3)
build/percona-shared-compat.spec (+2/-2)
build/rpm/mysql-dubious-exports.patch (+2/-2)
doc/source/installation.rst (+2/-2)
doc/source/management/pam_plugin.rst (+1/-1)
doc/source/upgrading_guide_51_55.rst (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

521. By Stewart Smith on 2013-12-23

change 2 remaining references to libmysqlclient to libperconaserverclient

520. By Stewart Smith on 2013-10-08

empty merge of 5.1 libperconaserverclient gca update

519. By Stewart Smith on 2013-10-08

merge latest 5.5 GCA

518. By Stewart Smith on 2013-07-23

rename libmysqlclient to libperconaserverclient

517. By Stewart Smith on 2013-07-23

null merge 5.1 libperconaserverclient

516. By <email address hidden> on 2013-05-21

Merge lp:~laurynas-biveinis/percona-server/bug1179978-5.5
http://jenkins.percona.com/job/merge-PS-5.5-kickoff/82/

515. By <email address hidden> on 2013-05-21

Merge lp:~sergei.glushchenko/percona-server/ST28246-bug1092593-5.5
http://jenkins.percona.com/job/merge-PS-5.5-kickoff/82/

514. By <email address hidden> on 2013-05-21

Merge lp:~sergei.glushchenko/percona-server/CVE-2012-5627-bug1172090-5.5
http://jenkins.percona.com/job/merge-PS-5.5-kickoff/82/

513. By <email address hidden> on 2013-05-21

Merge lp:~akopytov/percona-server/bug1170103-5.5
http://jenkins.percona.com/job/merge-PS-5.5-kickoff/82/

512. By Laurynas Biveinis on 2013-05-21

Automerge lp:~ignacio-nin/percona-server/5.5-bug1174426