Merge lp://staging/~laurynas-biveinis/percona-server/bmp-fixes-5.5 into lp://staging/percona-server/5.5
Proposed by
Laurynas Biveinis
| Status: | Merged |
|---|---|
| Approved by: | Stewart Smith |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 528 |
| Proposed branch: | lp://staging/~laurynas-biveinis/percona-server/bmp-fixes-5.5 |
| Merge into: | lp://staging/percona-server/5.5 |
| Diff against target: |
1312 lines (+537/-143) (has conflicts) 19 files modified
Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result (+7/-0) Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages.result (+58/-33) Percona-Server/mysql-test/suite/innodb/r/percona_changed_pages_empty.result (+1/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test (+33/-0) Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp_flush.test (+2/-2) Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages.test (+99/-28) Percona-Server/mysql-test/suite/innodb/t/percona_changed_pages_empty.test (+4/-2) Percona-Server/mysql-test/suite/sys_vars/r/all_vars.result (+0/-2) Percona-Server/mysql-test/suite/sys_vars/r/innodb_max_changed_pages_basic.result (+78/-0) Percona-Server/mysql-test/suite/sys_vars/t/innodb_max_changed_pages_basic.test (+60/-0) Percona-Server/storage/innobase/handler/i_s.cc (+8/-6) Percona-Server/storage/innobase/include/log0log.h (+3/-1) Percona-Server/storage/innobase/include/log0online.h (+2/-0) Percona-Server/storage/innobase/include/os0file.h (+4/-2) Percona-Server/storage/innobase/log/log0log.c (+13/-3) Percona-Server/storage/innobase/log/log0online.c (+161/-53) Percona-Server/storage/innobase/log/log0recv.c (+4/-3) Percona-Server/storage/innobase/os/os0file.c (+0/-2) Percona-Server/storage/innobase/srv/srv0start.c (+0/-6) Text conflict in Percona-Server/mysql-test/suite/innodb/r/percona_changed_page_bmp.result Text conflict in Percona-Server/mysql-test/suite/innodb/t/percona_changed_page_bmp.test |
| To merge this branch: | bzr merge lp://staging/~laurynas-biveinis/percona-server/bmp-fixes-5.5 |
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stewart Smith (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge bitmap fixes from 5.1, add 5.5+-specific fixes.
http://
To post a comment you must log in.
Revision history for this message
| Laurynas Biveinis (laurynas-biveinis) wrote | # |
Revision history for this message
| Stewart Smith (stewart) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The merge conflict is GCA vs trunk, does not hinder the review, and will be resolved at the trunk merge time.