Merge lp://qastaging/~tplavcic/percona-server/bug1405667-5.5 into lp://qastaging/percona-server/5.5
Status: | Merged |
---|---|
Approved by: | Laurynas Biveinis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 725 |
Proposed branch: | lp://qastaging/~tplavcic/percona-server/bug1405667-5.5 |
Merge into: | lp://qastaging/percona-server/5.5 |
Diff against target: |
301 lines (+58/-53) 2 files modified
build-ps/percona-server.spec (+5/-1) build-ps/rpm/mysql-5.5-sharedlib-rename.patch (+53/-52) |
To merge this branch: | bzr merge lp://qastaging/~tplavcic/percona-server/bug1405667-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+245484@code.qastaging.launchpad.net |
Description of the change
my.cnf was left out from file list (regression - bug1405667) and the patch on centos7 for renaming the shared library to libmysqlclient has been misaligned so it was failing to patch.
PS 5.6 patch fail:
http://
PS 5.5 patch fail:
http://
SOME TESTING:
PS 5.5 test:
------------
build: http://
TEST: centos6 - that my.cnf is present in the file list
[vagrant@
/etc/init.d/mysql
/etc/logrotate.
/etc/my.cnf
...
TEST: centos7 - that patch is working
http://
- the build is failing for other bug, but patch works
- tried to build without patches to check that it doesn't make the problem with debug plugins and the problem is still there even without rename patch - so that is the issue to be resolved - ticket already open and linked in jira for the 5.5 release
PS 5.6 test:
------------
build: http://
centos6: that my.cnf is on the filelist
[vagrant@
/etc/init.d/mysql
/etc/logrotate.
/etc/my.cnf
...
centos7: the patch seems working and packages are created
http://