lp:~stewart/drizzle/7.1-innodb-1.1.5
- Get this branch:
- bzr branch lp:~stewart/drizzle/7.1-innodb-1.1.5
Branch merges
- Drizzle Trunk: Pending requested
-
Diff: 3520 lines (+1778/-498)46 files modifiedplugin/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)
Branch information
Recent revisions
- 2549. By Drizzle Continuous Integration
-
modified:
plugin/gearman_ udf/function_ map.cc
plugin/gearman_ udf/gearman_ udf.cc
plugin/gearman_ udf/gman_ do.cc
plugin/gearman_ udf/gman_ servers_ set.cc
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-05-21 Update for compiling Gearman support. - 2548. By Brian Aker
-
Fix for calling current Gearman function, another for bad init of error variable, and finally a spurious return call.
- 2547. By Drizzle Continuous Integration
-
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-05-02 bzr set-root-id - 2545. By Drizzle Continuous Integration
-
modified:
drizzled/drizzled. cc
drizzled/execute/ scanner. l
pending merge tips: (use -v to see all merge revisions)
Andrew Hutchings 2012-04-21 Merge in both of Andrew's patchs for 7.1 - 2544. By Drizzle Continuous Integration
-
added:
tests/suite/regressio n/r/986455. result
tests/suite/regressio n/t/986455. test
modified:
.bzrignore
drizzled/identifier/ schema. cc
drizzled/identifier/ schema. h
drizzled/identifier/ table.cc
drizzled/identifier/ table.h
drizzled/table/instance/ base.cc
drizzled/util/backtrace. cc
drizzled/util/backtrace. h
libdrizzle-1.0/t/drizzle_ con_st. c
libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-04-20 Fix for lp:986455 - 2543. By Drizzle Continuous Integration
-
modified:
libdrizzle-1.0/t/drizzle_ con_st. c
libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-04-19 Clean up error messages on libdrizzle - 2542. By Drizzle Continuous Integration
-
modified:
drizzled/drizzled. cc
plugin/mysql_unix_ socket_ protocol/ protocol. cc
pending merge tips: (use -v to see all merge revisions)
Brian Aker 2012-04-17 Add atexit() call to make sure that we clean up the socket file. - 2541. By Drizzle Continuous Integration
-
modified:
plugin/slave/queue_ producer. cc
pending merge tips: (use -v to see all merge revisions)
Stewart Smith 2012-04-14 improve messages from slave io thread to better indicate what is going on at any one time.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:drizzle