Merge lp:~laurynas-biveinis/percona-server/bug805805-1060136-5.5 into lp:percona-server/5.5
Proposed by
Laurynas Biveinis
Status: | Merged |
---|---|
Approved by: | Alexey Kopytov |
Approved revision: | no longer in the source branch. |
Merged at revision: | 317 |
Proposed branch: | lp:~laurynas-biveinis/percona-server/bug805805-1060136-5.5 |
Merge into: | lp:percona-server/5.5 |
Diff against target: |
94 lines (+24/-3) 4 files modified
Percona-Server/mysql-test/lib/My/SafeProcess/safe_process.cc (+4/-1) Percona-Server/mysql-test/r/percona_signal_handling.result (+3/-0) Percona-Server/mysql-test/t/percona_signal_handling.test (+11/-0) Percona-Server/sql/net_serv.cc (+6/-2) |
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/bug805805-1060136-5.5 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Laurynas Biveinis (community) | Approve | ||
Alexey Kopytov | Pending | ||
Review via email: mp+128631@code.launchpad.net |
This proposal supersedes a proposal from 2012-10-04.
Description of the change
Auto-merge fixes for bug 1060136 and bug 805805 from 5.1.
Bug 805805 changes fix the code that is disabled on 5.1, but enabled
on 5.5.
Jenkins: http://
To post a comment you must log in.
OK to push after addressing the comments in 5.1 and re-merging to 5.5.