Merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1087202-1087218-5.1 into lp:percona-server/5.1
Status: | Superseded | ||||||||
---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~laurynas-biveinis/percona-server/BT-16274-bug1087202-1087218-5.1 | ||||||||
Merge into: | lp:percona-server/5.1 | ||||||||
Diff against target: |
158 lines (+40/-16) 6 files modified
Percona-Server/storage/innodb_plugin/handler/i_s.cc (+2/-2) Percona-Server/storage/innodb_plugin/include/ut0ut.h (+9/-0) Percona-Server/storage/innodb_plugin/include/ut0ut.ic (+13/-0) Percona-Server/storage/innodb_plugin/log/log0log.c (+2/-2) Percona-Server/storage/innodb_plugin/log/log0online.c (+10/-10) Percona-Server/storage/innodb_plugin/os/os0file.c (+4/-2) |
||||||||
To merge this branch: | bzr merge lp:~laurynas-biveinis/percona-server/BT-16274-bug1087202-1087218-5.1 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stewart Smith (community) | Needs Fixing on 2012-12-27 | ||
Sergei Glushchenko (community) | g2 | 2012-12-07 | Approve on 2012-12-11 |
Review via email:
|
This proposal has been superseded by a proposal from 2013-01-04.
Description of the change
- 496. By Hrvoje Matijakovic on 2012-12-10
-
* bug fix for Bug #1056603
* added missing tables with the description
* fixed already existing I_S tables
- 497. By <email address hidden> on 2012-12-11
- 498. By <email address hidden> on 2012-12-12
-
Merge lp:~laurynas-biveinis/percona-server/26611-bug917942-5.1
- 499. By <email address hidden> on 2012-12-12
-
Merge lp:~laurynas-biveinis/percona-server/26611-bug1064333-5.1
- 500. By <email address hidden> on 2012-12-12
-
Merge lp:~laurynas-biveinis/percona-server/26611-bug1059738-5.1
- 501. By <email address hidden> on 2012-12-13
- 502. By <email address hidden> on 2012-12-13
- 503. By <email address hidden> on 2012-12-13
- 504. By <email address hidden> on 2012-12-14
- 505. By <email address hidden> on 2012-12-14
-
Merge lp:~laurynas-biveinis/percona-server/xtradb-multiple-bmp-files-51
Stewart Smith (stewart) wrote : | # |
http://
22:36:24 Text conflict in Percona-
<<<<<<< TREE
=======
/* last_tracked_lsn might be < MIN_TRACKED_LSN in the case of empty
bitmap file, handle this too. */
>>>>>>> MERGE-SOURCE
- 509. By <email address hidden> on 2012-12-27
- 510. By <email address hidden> on 2013-01-03
-
Merge lp:~vlad-lesin/percona-server/5.1-bug1049871-injections-gca
- 511. By Laurynas Biveinis on 2013-01-04
-
Fix bug 1087202 (smaller type conversion bugs on 32 bit) and bug
1087218 (Incorrect implementation of os_file_set_eof_at on Windows).1) i_s_innodb_
changed_ pages_fill used Field:: store(double) to store
ulonglong.
2) ut_max, which is defined for ulints, was incorrectly used to
compare ib_uint64_t values in log_online_track_missing_ on_startup
and log_online_read_init. Fixed by introducing new inline
function ut_max_uint64 and using it instead.
3) Typecast to ulint the difference of two ib_uint64_ts in
log_online_ follow_ log_seg. The values are guaranteed to fit into
ulint.
4) In log_check_tracking_ margin and log_close adjust the type of
tracked_lsn_age to ib_uint64_t. In theory ulint could have been
used too, but ib_uint64_t future-proofs it against large log
files.
5) Provide correct Windows implementation for os_file_set_eof_at.Bugs found and patches provided by Vladislav Vaintroub.
Approve