lp:~stewart/drizzle/update-innobase-1.1.2
- Get this branch:
- bzr branch lp:~stewart/drizzle/update-innobase-1.1.2
Branch merges
- Drizzle Developers: Pending requested
-
Diff: 13055 lines (+3062/-2729)151 files modifieddrizzled/item/sum.cc (+4/-2)
drizzled/join.cc (+6/-3)
drizzled/sql_select.cc (+14/-2)
drizzled/sql_select.h (+1/-1)
plugin/innobase/ChangeLog (+28/-0)
plugin/innobase/btr/btr0btr.c (+3/-3)
plugin/innobase/btr/btr0cur.c (+185/-17)
plugin/innobase/btr/btr0sea.c (+35/-25)
plugin/innobase/buf/buf0buf.c (+15/-16)
plugin/innobase/buf/buf0flu.c (+43/-16)
plugin/innobase/buf/buf0lru.c (+4/-6)
plugin/innobase/data/data0data.c (+24/-19)
plugin/innobase/data/data0type.c (+6/-5)
plugin/innobase/dict/dict0boot.c (+26/-25)
plugin/innobase/dict/dict0crea.c (+21/-10)
plugin/innobase/dict/dict0dict.c (+54/-42)
plugin/innobase/dict/dict0load.c (+37/-38)
plugin/innobase/dict/dict0mem.c (+34/-1)
plugin/innobase/fil/fil0fil.c (+6/-6)
plugin/innobase/fsp/fsp0fsp.c (+59/-86)
plugin/innobase/ha/ha0ha.c (+13/-4)
plugin/innobase/handler/data_dictionary.cc (+10/-10)
plugin/innobase/handler/data_dictionary.h (+1/-1)
plugin/innobase/handler/ha_innodb.cc (+46/-32)
plugin/innobase/handler/handler0alter.cc (+4/-2)
plugin/innobase/ibuf/ibuf0ibuf.c (+184/-163)
plugin/innobase/include/btr0btr.h (+2/-2)
plugin/innobase/include/btr0btr.ic (+3/-4)
plugin/innobase/include/btr0cur.h (+6/-1)
plugin/innobase/include/btr0sea.h (+10/-0)
plugin/innobase/include/buf0buf.h (+2/-1)
plugin/innobase/include/data0data.h (+1/-1)
plugin/innobase/include/data0data.ic (+2/-2)
plugin/innobase/include/data0type.h (+36/-13)
plugin/innobase/include/data0type.ic (+52/-23)
plugin/innobase/include/dict0boot.h (+17/-14)
plugin/innobase/include/dict0boot.ic (+8/-8)
plugin/innobase/include/dict0dict.h (+36/-9)
plugin/innobase/include/dict0dict.ic (+47/-9)
plugin/innobase/include/dict0load.h (+18/-13)
plugin/innobase/include/dict0mem.h (+12/-11)
plugin/innobase/include/dict0mem.ic (+0/-32)
plugin/innobase/include/dict0types.h (+3/-0)
plugin/innobase/include/fil0fil.h (+1/-0)
plugin/innobase/include/ha0ha.h (+2/-0)
plugin/innobase/include/ha_prototypes.h (+8/-0)
plugin/innobase/include/ibuf0ibuf.ic (+6/-5)
plugin/innobase/include/lock0lock.h (+2/-2)
plugin/innobase/include/log0log.ic (+4/-1)
plugin/innobase/include/mach0data.h (+58/-76)
plugin/innobase/include/mach0data.ic (+134/-143)
plugin/innobase/include/mtr0log.h (+11/-11)
plugin/innobase/include/mtr0log.ic (+6/-6)
plugin/innobase/include/mtr0mtr.h (+0/-9)
plugin/innobase/include/os0file.h (+15/-9)
plugin/innobase/include/os0file.ic (+20/-10)
plugin/innobase/include/os0sync.h (+16/-57)
plugin/innobase/include/os0sync.ic (+8/-5)
plugin/innobase/include/page0page.h (+1/-1)
plugin/innobase/include/page0page.ic (+2/-3)
plugin/innobase/include/pars0pars.h (+4/-21)
plugin/innobase/include/que0que.h (+0/-3)
plugin/innobase/include/read0read.h (+4/-6)
plugin/innobase/include/read0read.ic (+6/-8)
plugin/innobase/include/rem0rec.h (+1/-1)
plugin/innobase/include/rem0rec.ic (+2/-2)
plugin/innobase/include/row0mysql.h (+16/-1)
plugin/innobase/include/row0upd.h (+1/-1)
plugin/innobase/include/srv0srv.h (+6/-3)
plugin/innobase/include/srv0start.h (+0/-4)
plugin/innobase/include/sync0rw.ic (+14/-19)
plugin/innobase/include/sync0sync.h (+1/-1)
plugin/innobase/include/sync0sync.ic (+5/-8)
plugin/innobase/include/trx0i_s.h (+7/-6)
plugin/innobase/include/trx0rec.h (+2/-2)
plugin/innobase/include/trx0rec.ic (+2/-2)
plugin/innobase/include/trx0sys.h (+6/-1)
plugin/innobase/include/trx0sys.ic (+5/-8)
plugin/innobase/include/trx0trx.h (+7/-17)
plugin/innobase/include/trx0trx.ic (+0/-12)
plugin/innobase/include/trx0types.h (+7/-8)
plugin/innobase/include/trx0undo.h (+1/-1)
plugin/innobase/include/trx0undo.ic (+18/-21)
plugin/innobase/include/univ.i (+20/-3)
plugin/innobase/include/ut0byte.h (+10/-161)
plugin/innobase/include/ut0byte.ic (+11/-249)
plugin/innobase/include/ut0dbg.h (+16/-28)
plugin/innobase/include/ut0rnd.h (+4/-4)
plugin/innobase/include/ut0rnd.ic (+6/-6)
plugin/innobase/lock/lock0lock.c (+41/-44)
plugin/innobase/log/log0log.c (+11/-11)
plugin/innobase/log/log0recv.c (+20/-20)
plugin/innobase/mach/mach0data.c (+0/-40)
plugin/innobase/mtr/mtr0log.c (+11/-11)
plugin/innobase/mtr/mtr0mtr.c (+6/-20)
plugin/innobase/os/os0file.c (+60/-34)
plugin/innobase/os/os0proc.c (+2/-2)
plugin/innobase/os/os0sync.c (+254/-204)
plugin/innobase/os/os0thread.c (+1/-13)
plugin/innobase/page/page0page.c (+3/-3)
plugin/innobase/page/page0zip.c (+3/-2)
plugin/innobase/pars/pars0pars.c (+3/-26)
plugin/innobase/read/read0read.c (+18/-24)
plugin/innobase/row/row0ins.c (+41/-45)
plugin/innobase/row/row0merge.c (+106/-50)
plugin/innobase/row/row0mysql.c (+69/-10)
plugin/innobase/row/row0purge.c (+25/-5)
plugin/innobase/row/row0row.c (+10/-6)
plugin/innobase/row/row0sel.c (+61/-41)
plugin/innobase/row/row0uins.c (+24/-3)
plugin/innobase/row/row0umod.c (+17/-5)
plugin/innobase/row/row0undo.c (+21/-6)
plugin/innobase/row/row0upd.c (+45/-9)
plugin/innobase/row/row0vers.c (+6/-6)
plugin/innobase/srv/srv0srv.c (+23/-7)
plugin/innobase/srv/srv0start.c (+32/-39)
plugin/innobase/sync/sync0arr.c (+1/-1)
plugin/innobase/sync/sync0sync.c (+20/-5)
plugin/innobase/tests/r/innodb.result (+1/-1)
plugin/innobase/tests/r/innodb_bug52745.result (+130/-0)
plugin/innobase/tests/r/innodb_bug55580.result (+22/-0)
plugin/innobase/tests/r/innodb_mysql.result (+7/-7)
plugin/innobase/tests/r/rowid_order_innodb.result (+1/-1)
plugin/innobase/tests/t/innodb_bug55580.test (+38/-0)
plugin/innobase/trx/trx0i_s.c (+4/-4)
plugin/innobase/trx/trx0purge.c (+56/-62)
plugin/innobase/trx/trx0rec.c (+29/-35)
plugin/innobase/trx/trx0roll.c (+37/-40)
plugin/innobase/trx/trx0rseg.c (+2/-2)
plugin/innobase/trx/trx0sys.c (+29/-40)
plugin/innobase/trx/trx0trx.c (+45/-57)
plugin/innobase/trx/trx0undo.c (+17/-12)
plugin/innobase/ut/ut0byte.c (+0/-25)
plugin/innobase/ut/ut0dbg.c (+3/-24)
plugin/innobase/ut/ut0mem.c (+0/-6)
plugin/myisam/tests/r/basic.result (+23/-27)
plugin/myisam/tests/t/basic.test (+15/-15)
tests/r/endspace.result (+5/-5)
tests/r/func_group.result (+3/-3)
tests/r/func_in.result (+1/-1)
tests/r/func_str.result (+1/-1)
tests/r/group_min_max.result (+1/-1)
tests/r/join_nested.result (+2/-2)
tests/r/negation_elimination.result (+7/-7)
tests/r/order_by.result (+5/-5)
tests/r/range.result (+9/-9)
tests/r/select.result (+3/-3)
tests/r/subselect.result (+1/-1)
tests/r/subselect_mat.result (+15/-15)
tests/r/user_var.result (+2/-2)
tests/t/endspace.test (+20/-1)
Related bugs
Related blueprints
Branch information
Recent revisions
- 2408. By Sergey Vojtovich <email address hidden>
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Sergey Vojtovich <email address hidden>
Original commit message:
Fixed race condition in a test case for BUG#55580. - 2407. By Georgi Kodinov
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Georgi Kodinov <email address hidden>
Original commit message:
Bug #55580 : segfault in read_view_sees_trx_ id The server was not checking for errors generated during
the execution of Item::val_xxx() methods when copying
data to the group, order, or distinct temp table's row.
Fixed by extending the copy_funcs() to return an error
code and by checking for that error code on the places
copy_funcs() is called.
Test case added. - 2406. By Marko Mäkelä <email address hidden>
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Marko Mäkelä <email address hidden>
Original commit message:
A non-functional change:dict_load_
index_low( ): Rename the parameter "cached" to "allocated"
and clarify the comments. - 2403. By Stewart Smith
-
update select and subselect_mat test results EXPLAIN output due to improvements in innodb stats
- 2402. By Stewart Smith
-
modified user_var test rusult due to EXPLAIN output change because of innodb stats changes
- 2401. By Stewart Smith
-
modified subselect test rusult due to EXPLAIN output change because of innodb stats changes
- 2400. By Stewart Smith
-
modified range test rusult due to EXPLAIN output change because of innodb stats changes
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:drizzle/7.0