lp:~stewart/drizzle/update-innobase
- Get this branch:
- bzr branch lp:~stewart/drizzle/update-innobase
Branch merges
- Brian Aker: Needs Fixing
-
Diff: 9822 lines (+3885/-1174)116 files modifiedmysql-test/innodb_bug46676.result (+9/-0)
mysql-test/innodb_bug46676.test (+16/-0)
plugin/innobase/ChangeLog (+316/-0)
plugin/innobase/btr/btr0btr.c (+29/-3)
plugin/innobase/btr/btr0sea.c (+17/-1)
plugin/innobase/buf/buf0buf.c (+211/-101)
plugin/innobase/buf/buf0flu.c (+26/-16)
plugin/innobase/buf/buf0lru.c (+167/-140)
plugin/innobase/buf/buf0rea.c (+22/-56)
plugin/innobase/data/data0type.c (+16/-0)
plugin/innobase/dict/dict0boot.c (+3/-0)
plugin/innobase/dict/dict0crea.c (+10/-7)
plugin/innobase/dict/dict0dict.c (+89/-9)
plugin/innobase/dict/dict0load.c (+83/-34)
plugin/innobase/dict/dict0mem.c (+1/-1)
plugin/innobase/fil/fil0fil.c (+87/-21)
plugin/innobase/fsp/fsp0fsp.c (+73/-7)
plugin/innobase/handler/ha_innodb.cc (+273/-77)
plugin/innobase/handler/ha_innodb.h (+16/-0)
plugin/innobase/handler/handler0alter.cc (+18/-10)
plugin/innobase/ibuf/ibuf0ibuf.c (+21/-0)
plugin/innobase/include/btr0sea.h (+6/-0)
plugin/innobase/include/buf0buf.h (+61/-71)
plugin/innobase/include/buf0buf.ic (+47/-45)
plugin/innobase/include/buf0lru.h (+43/-10)
plugin/innobase/include/buf0rea.h (+3/-5)
plugin/innobase/include/buf0types.h (+2/-0)
plugin/innobase/include/db0err.h (+1/-0)
plugin/innobase/include/dict0dict.h (+8/-1)
plugin/innobase/include/dict0mem.h (+21/-3)
plugin/innobase/include/fil0fil.h (+6/-9)
plugin/innobase/include/ibuf0ibuf.h (+6/-0)
plugin/innobase/include/lock0lock.h (+14/-0)
plugin/innobase/include/log0log.h (+22/-4)
plugin/innobase/include/log0log.ic (+53/-30)
plugin/innobase/include/log0recv.h (+23/-0)
plugin/innobase/include/mem0mem.h (+7/-0)
plugin/innobase/include/mem0pool.h (+7/-0)
plugin/innobase/include/mtr0mtr.h (+4/-1)
plugin/innobase/include/os0file.h (+9/-0)
plugin/innobase/include/os0sync.h (+70/-11)
plugin/innobase/include/page0page.h (+5/-2)
plugin/innobase/include/page0zip.h (+8/-4)
plugin/innobase/include/pars0pars.h (+6/-0)
plugin/innobase/include/row0ins.h (+1/-1)
plugin/innobase/include/row0mysql.h (+3/-3)
plugin/innobase/include/srv0srv.h (+7/-11)
plugin/innobase/include/thr0loc.h (+6/-0)
plugin/innobase/include/trx0i_s.h (+7/-0)
plugin/innobase/include/trx0purge.h (+6/-0)
plugin/innobase/include/trx0rec.h (+2/-2)
plugin/innobase/include/trx0rec.ic (+2/-2)
plugin/innobase/include/trx0roll.h (+13/-2)
plugin/innobase/include/trx0rseg.h (+7/-0)
plugin/innobase/include/trx0sys.h (+6/-0)
plugin/innobase/include/trx0trx.h (+1/-1)
plugin/innobase/include/trx0undo.h (+7/-0)
plugin/innobase/include/univ.i (+28/-36)
plugin/innobase/include/usr0sess.h (+5/-7)
plugin/innobase/include/ut0auxconf.h (+6/-6)
plugin/innobase/include/ut0byte.h (+2/-2)
plugin/innobase/include/ut0byte.ic (+2/-2)
plugin/innobase/include/ut0ut.h (+19/-1)
plugin/innobase/lock/lock0lock.c (+45/-5)
plugin/innobase/log/log0log.c (+128/-18)
plugin/innobase/log/log0recv.c (+188/-33)
plugin/innobase/mem/mem0dbg.c (+11/-0)
plugin/innobase/mem/mem0mem.c (+9/-1)
plugin/innobase/mem/mem0pool.c (+12/-0)
plugin/innobase/mtr/mtr0mtr.c (+5/-3)
plugin/innobase/mysql-test/innodb-consistent-master.opt (+1/-0)
plugin/innobase/mysql-test/innodb-consistent.result (+35/-0)
plugin/innobase/mysql-test/innodb-consistent.test (+58/-0)
plugin/innobase/mysql-test/innodb_bug44369.result (+14/-0)
plugin/innobase/mysql-test/innodb_bug44369.test (+21/-0)
plugin/innobase/mysql-test/innodb_bug44571.result (+9/-0)
plugin/innobase/mysql-test/innodb_bug44571.test (+17/-0)
plugin/innobase/mysql-test/innodb_bug46000.result (+19/-0)
plugin/innobase/mysql-test/innodb_bug46000.test (+32/-0)
plugin/innobase/mysql-test/innodb_bug47167.result (+24/-0)
plugin/innobase/mysql-test/innodb_bug47167.test (+45/-0)
plugin/innobase/mysql-test/innodb_bug47777.result (+13/-0)
plugin/innobase/mysql-test/innodb_bug47777.test (+24/-0)
plugin/innobase/os/os0file.c (+210/-10)
plugin/innobase/os/os0proc.c (+1/-0)
plugin/innobase/os/os0sync.c (+4/-0)
plugin/innobase/os/os0thread.c (+1/-0)
plugin/innobase/page/page0cur.c (+1/-1)
plugin/innobase/page/page0page.c (+2/-2)
plugin/innobase/page/page0zip.c (+52/-13)
plugin/innobase/pars/pars0lex.l (+26/-0)
plugin/innobase/que/que0que.c (+8/-0)
plugin/innobase/row/row0ins.c (+4/-4)
plugin/innobase/row/row0merge.c (+220/-41)
plugin/innobase/row/row0mysql.c (+32/-60)
plugin/innobase/srv/srv0srv.c (+39/-32)
plugin/innobase/srv/srv0start.c (+62/-85)
plugin/innobase/sync/sync0arr.c (+5/-15)
plugin/innobase/sync/sync0rw.c (+1/-0)
plugin/innobase/sync/sync0sync.c (+50/-26)
plugin/innobase/tests/r/innodb.result (+1/-1)
plugin/innobase/tests/t/innodb.test (+1/-1)
plugin/innobase/thr/thr0loc.c (+31/-0)
plugin/innobase/trx/trx0i_s.c (+38/-1)
plugin/innobase/trx/trx0purge.c (+38/-0)
plugin/innobase/trx/trx0rec.c (+1/-1)
plugin/innobase/trx/trx0roll.c (+47/-27)
plugin/innobase/trx/trx0rseg.c (+43/-0)
plugin/innobase/trx/trx0sys.c (+78/-0)
plugin/innobase/trx/trx0trx.c (+2/-2)
plugin/innobase/trx/trx0undo.c (+1/-1)
plugin/innobase/usr/usr0sess.c (+6/-33)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c (+23/-3)
plugin/innobase/ut/ut0auxconf_have_gcc_atomics.c (+61/-0)
plugin/innobase/ut/ut0mem.c (+2/-0)
plugin/innobase/ut/ut0ut.c (+19/-0)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
- 2534. By jimmy
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Jimmy Yang <email address hidden>
Original commit message:
Fix Bug #16290 Unclear error message when adding foreign key constraintrb://502 approved by Sunny Bains
- 2533. 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:
Fix a debug assertion failure in the Bug#57802 fix.thr_local_create(): Initialize local->slot_no to ULINT_UNDEFINED.
thr_local_validate( ): Allow local->slot_no to be ULINT_UNDEFINED. - 2532. By Vasil Dimov
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Vasil Dimov <email address hidden>
Original commit message:
Remove unused parameter has_dict_mutex of dict_update_statistics_ low() Also delete dict_update_
statistics( ) and rename dict_update_ statistics_ low()
to dict_update_statistics( ) because the only thing that distinguished those
two functions was the removed parameter. - 2531. By Marko Mäkelä <email address hidden>
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Marko Mkel <email address hidden>
Original commit message:
Bug#57802 Empty ASSERTION parameter passed to the HASH_SEARCH macrothr_local_
validate( ), i_s_locks_ row_validate( ): New validate
functions, used in UNIV_DEBUG code for checking the state of internal
memory structures. - 2530. By Vasil Dimov
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Vasil Dimov <email address hidden>
Original commit message:
Increment InnoDB version from 1.1.3 to 1.1.4
InnoDB 1.1.3 was released with MySQL 5.5.7-rc - 2529. By jimmy
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Jimmy Yang <email address hidden>
Original commit message:
Fix Bug #48026 Log start and end of InnoDB buffer pool initialization
to the error logrb://513 approved by Sunny Bains
- 2528. 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:
row_ins_index_entry( ): Note that only CREATE INDEX sets foreign=FALSE. - 2527. By Sunny Bains
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Sunny Bains <email address hidden>
Original commit message:
Add change log entry for bug#54538 fix. - 2526. By Marko Mäkelä <email address hidden>
-
Merge Revision revid:<email address hidden> from MySQL InnoDB
Original revid:<email address hidden>
Original Authors: Marko Mkel <email address hidden>
Original commit message:
rw_lock_debug_print( ): Output the thread ID in unsigned format.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~drizzle-trunk/drizzle/development
