Merge lp://qastaging/~stewart/drizzle/7.1-innodb-1.1.5 into lp://qastaging/drizzle/7.1
Proposed by
Stewart Smith
| Status: | Merged |
|---|---|
| Merged at revision: | 2550 |
| Proposed branch: | lp://qastaging/~stewart/drizzle/7.1-innodb-1.1.5 |
| Merge into: | lp://qastaging/drizzle/7.1 |
| Diff against target: |
3520 lines (+1778/-498) 46 files modified
plugin/innobase/btr/btr0btr.cc (+1/-1) plugin/innobase/btr/btr0cur.cc (+28/-132) plugin/innobase/buf/buf0buf.cc (+272/-83) plugin/innobase/buf/buf0flu.cc (+30/-2) plugin/innobase/buf/buf0lru.cc (+12/-4) plugin/innobase/dict/dict0dict.cc (+45/-30) plugin/innobase/dict/dict0load.cc (+17/-3) plugin/innobase/dict/dict0mem.cc (+56/-0) plugin/innobase/fil/fil0fil.cc (+32/-4) plugin/innobase/fsp/fsp0fsp.cc (+1/-1) plugin/innobase/handler/ha_innodb.cc (+1/-1) plugin/innobase/ibuf/ibuf0ibuf.cc (+96/-17) plugin/innobase/include/btr0cur.h (+14/-28) plugin/innobase/include/buf0buf.h (+70/-0) plugin/innobase/include/data0data.h (+8/-3) plugin/innobase/include/data0data.ic (+18/-8) plugin/innobase/include/dict0mem.h (+24/-0) plugin/innobase/include/ibuf0ibuf.h (+38/-9) plugin/innobase/include/mem0mem.ic (+6/-6) plugin/innobase/include/mtr0mtr.ic (+1/-1) plugin/innobase/include/os0file.h (+2/-0) plugin/innobase/include/row0upd.h (+11/-3) plugin/innobase/include/srv0srv.h (+10/-2) plugin/innobase/include/sync0rw.h (+1/-0) plugin/innobase/include/univ.i (+25/-10) plugin/innobase/include/ut0bh.h (+152/-0) plugin/innobase/include/ut0bh.ic (+125/-0) plugin/innobase/include/ut0ut.h (+13/-13) plugin/innobase/include/ut0vec.h (+19/-0) plugin/innobase/include/ut0vec.ic (+29/-0) plugin/innobase/lock/lock0lock.cc (+75/-4) plugin/innobase/log/log0recv.cc (+1/-1) plugin/innobase/os/os0file.cc (+34/-9) plugin/innobase/plugin.am (+3/-0) plugin/innobase/row/row0ins.cc (+1/-1) plugin/innobase/row/row0merge.cc (+2/-2) plugin/innobase/row/row0mysql.cc (+2/-2) plugin/innobase/row/row0purge.cc (+1/-1) plugin/innobase/row/row0umod.cc (+6/-7) plugin/innobase/row/row0upd.cc (+254/-91) plugin/innobase/srv/srv0srv.cc (+39/-5) plugin/innobase/srv/srv0start.cc (+19/-1) plugin/innobase/sync/sync0arr.cc (+18/-10) plugin/innobase/trx/trx0i_s.cc (+1/-2) plugin/innobase/ut/ut0bh.cc (+164/-0) plugin/innobase/ut/ut0dbg.cc (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~stewart/drizzle/7.1-innodb-1.1.5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Drizzle Trunk | Pending | ||
|
Review via email:
|
|||
Description of the change
Update InnoDB to 1.1.5 from MySQL 5.5.9
No Jenkins run as it's giving me 404 instead of, well, Jenkins.
To post a comment you must log in.
Revision history for this message
| Stewart Smith (stewart) wrote | # |
Revision history for this message
| Vijay Samuel (vjsamuel) wrote | # |
Revision history for this message
| Brian Aker (brianaker) wrote | # |
Revision history for this message
| Stewart Smith (stewart) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
https:/