lp://staging/~mordred/drizzle/innodb-plugin-merge
Created by
Monty Taylor
and last modified
- Get this branch:
- bzr branch lp://staging/~mordred/drizzle/innodb-plugin-merge
Only
Monty Taylor
can upload to this branch. If you are
Monty Taylor
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Brian Aker: Pending requested
- Drizzle Developers: Pending requested
-
Diff: 121602 lines338 files modifiedplugin/innobase/CMakeLists.txt (+117/-83)
plugin/innobase/COPYING.Percona (+30/-0)
plugin/innobase/COPYING.Sun_Microsystems (+31/-0)
plugin/innobase/ChangeLog (+1149/-0)
plugin/innobase/Doxyfile (+1419/-0)
plugin/innobase/Makefile.am (+327/-303)
plugin/innobase/README (+1/-1)
plugin/innobase/btr/btr0btr.c (+344/-308)
plugin/innobase/btr/btr0cur.c (+493/-456)
plugin/innobase/btr/btr0pcur.c (+42/-44)
plugin/innobase/btr/btr0sea.c (+92/-90)
plugin/innobase/buf/buf0buddy.c (+79/-69)
plugin/innobase/buf/buf0buf.c (+312/-288)
plugin/innobase/buf/buf0flu.c (+222/-67)
plugin/innobase/buf/buf0lru.c (+122/-116)
plugin/innobase/buf/buf0rea.c (+87/-203)
plugin/innobase/data/data0data.c (+70/-64)
plugin/innobase/data/data0type.c (+45/-64)
plugin/innobase/dict/dict0boot.c (+23/-23)
plugin/innobase/dict/dict0crea.c (+111/-115)
plugin/innobase/dict/dict0dict.c (+517/-489)
plugin/innobase/dict/dict0load.c (+64/-74)
plugin/innobase/dict/dict0mem.c (+57/-46)
plugin/innobase/dyn/dyn0dyn.c (+6/-5)
plugin/innobase/eval/eval0eval.c (+42/-41)
plugin/innobase/eval/eval0proc.c (+26/-25)
plugin/innobase/fil/fil0fil.c (+682/-735)
plugin/innobase/fsp/fsp0fsp.c (+494/-534)
plugin/innobase/fut/fut0fut.c (+2/-1)
plugin/innobase/fut/fut0lst.c (+46/-45)
plugin/innobase/ha/ha0ha.c (+64/-65)
plugin/innobase/ha/ha0storage.c (+11/-10)
plugin/innobase/ha/hash0hash.c (+33/-24)
plugin/innobase/handler/ha_innodb.cc (+1091/-1117)
plugin/innobase/handler/ha_innodb.h (+34/-40)
plugin/innobase/handler/handler0alter.cc (+78/-75)
plugin/innobase/handler/handler0vars.h (+3/-2)
plugin/innobase/handler/i_s.cc (+112/-122)
plugin/innobase/handler/i_s.h (+2/-1)
plugin/innobase/handler/mysql_addons.cc (+2/-1)
plugin/innobase/handler/win_delay_loader.cc (+105/-117)
plugin/innobase/ibuf/ibuf0ibuf.c (+336/-322)
plugin/innobase/include/btr0btr.h (+235/-220)
plugin/innobase/include/btr0btr.ic (+78/-66)
plugin/innobase/include/btr0cur.h (+317/-306)
plugin/innobase/include/btr0cur.ic (+46/-46)
plugin/innobase/include/btr0pcur.h (+165/-173)
plugin/innobase/include/btr0pcur.ic (+114/-119)
plugin/innobase/include/btr0sea.h (+96/-90)
plugin/innobase/include/btr0sea.ic (+12/-11)
plugin/innobase/include/btr0types.h (+7/-3)
plugin/innobase/include/buf0buddy.h (+11/-10)
plugin/innobase/include/buf0buddy.ic (+22/-24)
plugin/innobase/include/buf0buf.h (+688/-568)
plugin/innobase/include/buf0buf.ic (+219/-229)
plugin/innobase/include/buf0flu.h (+81/-40)
plugin/innobase/include/buf0flu.ic (+15/-12)
plugin/innobase/include/buf0lru.h (+55/-57)
plugin/innobase/include/buf0lru.ic (+2/-1)
plugin/innobase/include/buf0rea.h (+32/-29)
plugin/innobase/include/buf0types.h (+22/-12)
plugin/innobase/include/data0data.h (+194/-191)
plugin/innobase/include/data0data.ic (+122/-118)
plugin/innobase/include/data0type.h (+148/-133)
plugin/innobase/include/data0type.ic (+115/-103)
plugin/innobase/include/data0types.h (+2/-1)
plugin/innobase/include/db0err.h (+2/-1)
plugin/innobase/include/dict0boot.h (+22/-22)
plugin/innobase/include/dict0boot.ic (+13/-12)
plugin/innobase/include/dict0crea.h (+49/-51)
plugin/innobase/include/dict0crea.ic (+2/-1)
plugin/innobase/include/dict0dict.h (+499/-488)
plugin/innobase/include/dict0dict.ic (+211/-189)
plugin/innobase/include/dict0load.h (+27/-31)
plugin/innobase/include/dict0load.ic (+2/-1)
plugin/innobase/include/dict0mem.h (+222/-186)
plugin/innobase/include/dict0mem.ic (+2/-1)
plugin/innobase/include/dict0types.h (+6/-3)
plugin/innobase/include/dyn0dyn.h (+67/-61)
plugin/innobase/include/dyn0dyn.ic (+59/-56)
plugin/innobase/include/eval0eval.h (+30/-29)
plugin/innobase/include/eval0eval.ic (+41/-40)
plugin/innobase/include/eval0proc.h (+34/-33)
plugin/innobase/include/eval0proc.ic (+10/-9)
plugin/innobase/include/fil0fil.h (+287/-262)
plugin/innobase/include/fsp0fsp.h (+131/-205)
plugin/innobase/include/fsp0fsp.ic (+7/-6)
plugin/innobase/include/fsp0types.h (+110/-0)
plugin/innobase/include/fut0fut.h (+11/-10)
plugin/innobase/include/fut0fut.ic (+11/-10)
plugin/innobase/include/fut0lst.h (+82/-79)
plugin/innobase/include/fut0lst.ic (+39/-38)
plugin/innobase/include/ha0ha.h (+121/-68)
plugin/innobase/include/ha0ha.ic (+58/-52)
plugin/innobase/include/ha0storage.h (+47/-36)
plugin/innobase/include/ha0storage.ic (+24/-22)
plugin/innobase/include/ha_prototypes.h (+143/-91)
plugin/innobase/include/handler0alter.h (+9/-8)
plugin/innobase/include/hash0hash.h (+96/-79)
plugin/innobase/include/hash0hash.ic (+45/-42)
plugin/innobase/include/ibuf0ibuf.h (+103/-95)
plugin/innobase/include/ibuf0ibuf.ic (+57/-55)
plugin/innobase/include/ibuf0types.h (+2/-1)
plugin/innobase/include/lock0iter.h (+10/-9)
plugin/innobase/include/lock0lock.h (+323/-352)
plugin/innobase/include/lock0lock.ic (+23/-25)
plugin/innobase/include/lock0priv.h (+31/-29)
plugin/innobase/include/lock0priv.ic (+6/-5)
plugin/innobase/include/lock0types.h (+2/-1)
plugin/innobase/include/log0log.h (+350/-285)
plugin/innobase/include/log0log.ic (+89/-79)
plugin/innobase/include/log0recv.h (+206/-132)
plugin/innobase/include/log0recv.ic (+13/-8)
plugin/innobase/include/mach0data.h (+160/-158)
plugin/innobase/include/mach0data.ic (+143/-141)
plugin/innobase/include/mem0dbg.h (+35/-34)
plugin/innobase/include/mem0dbg.ic (+25/-22)
plugin/innobase/include/mem0mem.h (+112/-126)
plugin/innobase/include/mem0mem.ic (+103/-101)
plugin/innobase/include/mem0pool.h (+34/-31)
plugin/innobase/include/mem0pool.ic (+2/-1)
plugin/innobase/include/mtr0log.h (+109/-106)
plugin/innobase/include/mtr0log.ic (+61/-34)
plugin/innobase/include/mtr0mtr.h (+193/-157)
plugin/innobase/include/mtr0mtr.ic (+57/-51)
plugin/innobase/include/mtr0types.h (+2/-1)
plugin/innobase/include/mysql_addons.h (+4/-1)
plugin/innobase/include/os0file.h (+296/-256)
plugin/innobase/include/os0proc.h (+14/-21)
plugin/innobase/include/os0proc.ic (+2/-1)
plugin/innobase/include/os0sync.h (+159/-82)
plugin/innobase/include/os0sync.ic (+6/-15)
plugin/innobase/include/os0thread.h (+40/-36)
plugin/innobase/include/os0thread.ic (+2/-1)
plugin/innobase/include/page0cur.h (+138/-138)
plugin/innobase/include/page0cur.ic (+68/-69)
plugin/innobase/include/page0page.h (+393/-400)
plugin/innobase/include/page0page.ic (+234/-221)
plugin/innobase/include/page0types.h (+38/-30)
plugin/innobase/include/page0zip.h (+178/-166)
plugin/innobase/include/page0zip.ic (+61/-62)
plugin/innobase/include/pars0opt.h (+12/-11)
plugin/innobase/include/pars0opt.ic (+2/-1)
plugin/innobase/include/pars0pars.h (+322/-327)
plugin/innobase/include/pars0pars.ic (+2/-1)
plugin/innobase/include/pars0sym.h (+85/-80)
plugin/innobase/include/pars0sym.ic (+2/-1)
plugin/innobase/include/pars0types.h (+2/-1)
plugin/innobase/include/que0que.h (+141/-154)
plugin/innobase/include/que0que.ic (+51/-53)
plugin/innobase/include/que0types.h (+5/-4)
plugin/innobase/include/read0read.h (+68/-55)
plugin/innobase/include/read0read.ic (+17/-16)
plugin/innobase/include/read0types.h (+2/-1)
plugin/innobase/include/rem0cmp.h (+86/-97)
plugin/innobase/include/rem0cmp.ic (+28/-29)
plugin/innobase/include/rem0rec.h (+326/-324)
plugin/innobase/include/rem0rec.ic (+309/-314)
plugin/innobase/include/rem0types.h (+2/-1)
plugin/innobase/include/row0ext.h (+29/-32)
plugin/innobase/include/row0ext.ic (+16/-19)
plugin/innobase/include/row0ins.h (+42/-43)
plugin/innobase/include/row0ins.ic (+2/-1)
plugin/innobase/include/row0merge.h (+75/-76)
plugin/innobase/include/row0mysql.h (+273/-266)
plugin/innobase/include/row0mysql.ic (+2/-1)
plugin/innobase/include/row0purge.h (+21/-20)
plugin/innobase/include/row0purge.ic (+2/-1)
plugin/innobase/include/row0row.h (+110/-131)
plugin/innobase/include/row0row.ic (+21/-20)
plugin/innobase/include/row0sel.h (+173/-161)
plugin/innobase/include/row0sel.ic (+13/-12)
plugin/innobase/include/row0types.h (+2/-1)
plugin/innobase/include/row0uins.h (+6/-5)
plugin/innobase/include/row0uins.ic (+2/-1)
plugin/innobase/include/row0umod.h (+7/-6)
plugin/innobase/include/row0umod.ic (+2/-1)
plugin/innobase/include/row0undo.h (+55/-49)
plugin/innobase/include/row0undo.ic (+2/-1)
plugin/innobase/include/row0upd.h (+174/-166)
plugin/innobase/include/row0upd.ic (+41/-36)
plugin/innobase/include/row0vers.h (+44/-44)
plugin/innobase/include/row0vers.ic (+2/-1)
plugin/innobase/include/srv0que.h (+6/-32)
plugin/innobase/include/srv0srv.h (+236/-154)
plugin/innobase/include/srv0srv.ic (+2/-1)
plugin/innobase/include/srv0start.h (+50/-34)
plugin/innobase/include/sync0arr.h (+39/-35)
plugin/innobase/include/sync0arr.ic (+2/-1)
plugin/innobase/include/sync0rw.h (+188/-170)
plugin/innobase/include/sync0rw.ic (+102/-110)
plugin/innobase/include/sync0sync.h (+129/-117)
plugin/innobase/include/sync0sync.ic (+41/-89)
plugin/innobase/include/sync0types.h (+4/-1)
plugin/innobase/include/thr0loc.h (+16/-15)
plugin/innobase/include/thr0loc.ic (+2/-1)
plugin/innobase/include/trx0i_s.h (+109/-81)
plugin/innobase/include/trx0purge.h (+52/-54)
plugin/innobase/include/trx0purge.ic (+6/-5)
plugin/innobase/include/trx0rec.h (+152/-147)
plugin/innobase/include/trx0rec.ic (+36/-40)
plugin/innobase/include/trx0roll.h (+133/-132)
plugin/innobase/include/trx0roll.ic (+7/-6)
plugin/innobase/include/trx0rseg.h (+62/-66)
plugin/innobase/include/trx0rseg.ic (+33/-34)
plugin/innobase/include/trx0sys.h (+289/-219)
plugin/innobase/include/trx0sys.ic (+79/-75)
plugin/innobase/include/trx0trx.h (+211/-242)
plugin/innobase/include/trx0trx.ic (+25/-82)
plugin/innobase/include/trx0types.h (+44/-14)
plugin/innobase/include/trx0undo.h (+239/-221)
plugin/innobase/include/trx0undo.ic (+85/-78)
plugin/innobase/include/trx0xa.h (+27/-18)
plugin/innobase/include/univ.i (+51/-26)
plugin/innobase/include/usr0sess.h (+12/-11)
plugin/innobase/include/usr0sess.ic (+2/-1)
plugin/innobase/include/usr0types.h (+2/-1)
plugin/innobase/include/ut0auxconf.h (+1/-1)
plugin/innobase/include/ut0byte.h (+117/-115)
plugin/innobase/include/ut0byte.ic (+99/-101)
plugin/innobase/include/ut0dbg.h (+41/-26)
plugin/innobase/include/ut0list.h (+57/-50)
plugin/innobase/include/ut0list.ic (+15/-8)
plugin/innobase/include/ut0lst.h (+102/-84)
plugin/innobase/include/ut0mem.h (+121/-86)
plugin/innobase/include/ut0mem.ic (+53/-23)
plugin/innobase/include/ut0rnd.h (+50/-49)
plugin/innobase/include/ut0rnd.ic (+43/-41)
plugin/innobase/include/ut0sort.h (+3/-2)
plugin/innobase/include/ut0ut.h (+184/-127)
plugin/innobase/include/ut0ut.ic (+39/-38)
plugin/innobase/include/ut0vec.h (+38/-30)
plugin/innobase/include/ut0vec.ic (+27/-19)
plugin/innobase/include/ut0wqueue.h (+25/-17)
plugin/innobase/lock/lock0iter.c (+10/-9)
plugin/innobase/lock/lock0lock.c (+612/-700)
plugin/innobase/log/log0log.c (+255/-208)
plugin/innobase/log/log0recv.c (+434/-301)
plugin/innobase/mach/mach0data.c (+14/-15)
plugin/innobase/mem/mem0dbg.c (+74/-62)
plugin/innobase/mem/mem0mem.c (+70/-78)
plugin/innobase/mem/mem0pool.c (+63/-62)
plugin/innobase/mtr/mtr0log.c (+75/-72)
plugin/innobase/mtr/mtr0mtr.c (+47/-36)
plugin/innobase/mysql-test/innodb-autoinc.result (+22/-0)
plugin/innobase/mysql-test/innodb-autoinc.test (+20/-0)
plugin/innobase/mysql-test/innodb-index.result (+36/-0)
plugin/innobase/mysql-test/innodb-index.test (+23/-0)
plugin/innobase/mysql-test/innodb-semi-consistent.result (+7/-0)
plugin/innobase/mysql-test/innodb-semi-consistent.test (+13/-0)
plugin/innobase/mysql-test/innodb.result (+33/-31)
plugin/innobase/mysql-test/innodb.test (+47/-16)
plugin/innobase/mysql-test/innodb_bug21704.result (+55/-0)
plugin/innobase/mysql-test/innodb_bug21704.test (+96/-0)
plugin/innobase/mysql-test/innodb_bug40565.result (+9/-0)
plugin/innobase/mysql-test/innodb_bug40565.test (+10/-0)
plugin/innobase/mysql-test/innodb_bug42101-nonzero-master.opt (+1/-0)
plugin/innobase/mysql-test/innodb_bug42101-nonzero.result (+26/-0)
plugin/innobase/mysql-test/innodb_bug42101-nonzero.test (+21/-0)
plugin/innobase/mysql-test/innodb_bug42101.result (+22/-0)
plugin/innobase/mysql-test/innodb_bug42101.test (+19/-0)
plugin/innobase/mysql-test/innodb_bug44032.result (+7/-0)
plugin/innobase/mysql-test/innodb_bug44032.test (+13/-0)
plugin/innobase/mysql-test/innodb_bug45357.result (+7/-0)
plugin/innobase/mysql-test/innodb_bug45357.test (+10/-0)
plugin/innobase/mysql-test/innodb_file_format.result (+44/-0)
plugin/innobase/mysql-test/innodb_file_format.test (+28/-0)
plugin/innobase/mysql-test/patches/bug32625.diff (+0/-10)
plugin/innobase/mysql-test/patches/bug41893.diff (+0/-87)
plugin/innobase/mysql-test/patches/innodb_file_per_table.diff (+47/-0)
plugin/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff (+55/-0)
plugin/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff (+31/-0)
plugin/innobase/os/os0file.c (+460/-410)
plugin/innobase/os/os0proc.c (+12/-44)
plugin/innobase/os/os0sync.c (+60/-108)
plugin/innobase/os/os0thread.c (+45/-36)
plugin/innobase/page/page0cur.c (+195/-130)
plugin/innobase/page/page0page.c (+260/-220)
plugin/innobase/page/page0zip.c (+450/-397)
plugin/innobase/pars/lexyy.c (+4/-4)
plugin/innobase/pars/pars0lex.l (+3/-3)
plugin/innobase/pars/pars0opt.c (+96/-104)
plugin/innobase/pars/pars0pars.c (+291/-300)
plugin/innobase/pars/pars0sym.c (+40/-39)
plugin/innobase/plug.in (+93/-21)
plugin/innobase/plugin.ac (+174/-0)
plugin/innobase/plugin.am (+325/-0)
plugin/innobase/que/que0que.c (+91/-124)
plugin/innobase/read/read0read.c (+36/-34)
plugin/innobase/rem/rem0cmp.c (+107/-147)
plugin/innobase/rem/rem0rec.c (+141/-141)
plugin/innobase/row/row0ext.c (+15/-14)
plugin/innobase/row/row0ins.c (+181/-211)
plugin/innobase/row/row0merge.c (+353/-347)
plugin/innobase/row/row0mysql.c (+401/-331)
plugin/innobase/row/row0purge.c (+59/-60)
plugin/innobase/row/row0row.c (+117/-191)
plugin/innobase/row/row0sel.c (+293/-356)
plugin/innobase/row/row0uins.c (+24/-24)
plugin/innobase/row/row0umod.c (+75/-80)
plugin/innobase/row/row0undo.c (+26/-27)
plugin/innobase/row/row0upd.c (+236/-227)
plugin/innobase/row/row0vers.c (+51/-51)
plugin/innobase/srv/srv0que.c (+4/-81)
plugin/innobase/srv/srv0srv.c (+306/-210)
plugin/innobase/srv/srv0start.c (+188/-124)
plugin/innobase/sync/sync0arr.c (+106/-103)
plugin/innobase/sync/sync0rw.c (+97/-91)
plugin/innobase/sync/sync0sync.c (+149/-143)
plugin/innobase/thr/thr0loc.c (+34/-30)
plugin/innobase/trx/trx0i_s.c (+201/-181)
plugin/innobase/trx/trx0purge.c (+68/-70)
plugin/innobase/trx/trx0rec.c (+194/-200)
plugin/innobase/trx/trx0roll.c (+133/-146)
plugin/innobase/trx/trx0rseg.c (+32/-33)
plugin/innobase/trx/trx0sys.c (+338/-135)
plugin/innobase/trx/trx0trx.c (+130/-132)
plugin/innobase/trx/trx0undo.c (+298/-288)
plugin/innobase/usr/usr0sess.c (+13/-12)
plugin/innobase/ut/ut0auxconf.c (+0/-13)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c (+43/-0)
plugin/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c (+34/-0)
plugin/innobase/ut/ut0auxconf_have_solaris_atomics.c (+39/-0)
plugin/innobase/ut/ut0auxconf_pause.c (+32/-0)
plugin/innobase/ut/ut0auxconf_sizeof_pthread_t.c (+35/-0)
plugin/innobase/ut/ut0byte.c (+11/-6)
plugin/innobase/ut/ut0dbg.c (+27/-20)
plugin/innobase/ut/ut0list.c (+38/-31)
plugin/innobase/ut/ut0mem.c (+105/-72)
plugin/innobase/ut/ut0rnd.c (+11/-8)
plugin/innobase/ut/ut0ut.c (+97/-85)
plugin/innobase/ut/ut0vec.c (+15/-8)
plugin/innobase/ut/ut0wqueue.c (+21/-13)
plugin/innobase/win-plugin/README (+0/-3)
plugin/innobase/win-plugin/win-plugin.diff (+35/-53)
tests/include/deadlock.inc (+2/-1)
tests/r/deadlock_innodb.result (+4/-1)
tests/r/innodb.result (+1/-1)
Related source package recipes
Branch information
Recent revisions
- 651. By Monty Taylor
-
Fixed a compile error. Fixed up test cases to deal with the new DD column in
InnoDB. - 650. By Monty Taylor
-
Fixed compile issues post-merge.
Modified CMPMEM data_dictionary tables to handle multiple buffer pools. - 642. By Monty Taylor <email address hidden>
-
Removed old innobase dir so I can re-do this madness from scratch the right way.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/~drizzle-trunk/drizzle/development
