Merge lp:~laurynas-biveinis/percona-server/bug1046389 into lp:percona-server/5.1
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Stewart Smith | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 483 | ||||
Proposed branch: | lp:~laurynas-biveinis/percona-server/bug1046389 | ||||
Merge into: | lp:percona-server/5.1 | ||||
Diff against target: |
60 lines (+8/-6) 3 files modified
Percona-Server/mysql-test/r/percona_server_variables_debug.result (+2/-0) Percona-Server/storage/innodb_plugin/buf/buf0buf.c (+5/-5) Percona-Server/storage/innodb_plugin/page/page0page.c (+1/-1) |
||||
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/bug1046389 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stewart Smith (community) | Approve | ||
George Ormond Lorch III (community) | g2 | Approve | |
Percona core | g1 | Pending | |
Laurynas Biveinis | Pending | ||
Review via email: mp+126223@code.launchpad.net |
This proposal supersedes a proposal from 2012-09-06.
Description of the change
Fix bug 1046389 (UNIV_DEBUG build broken).
There are two regressions, both fixed:
1) Fix for bug 905334 regressed in adding debug-specific code with
missing local variable that breaks the build.
2) Dynamic UNIV_PAGE_SIZE introduced a warning regression, presumably
with a recent compiler.
Re-recorded the percona_
variables enabled.
Jenkins run, adjusted accordingly: http://
Null-merge for 5.5
Has to go to trunk in a separate merge with the main Jenkins configuration adjusted to add -DUNIV_DEBUG at the same time. (I can take care of this).
The code looks good.