lp:~stewart/drizzle/7.1-innodb-from-mysql-5.5.10
- Get this branch:
- bzr branch lp:~stewart/drizzle/7.1-innodb-from-mysql-5.5.10
Branch merges
- Drizzle Trunk: Pending requested
-
Diff: 2942 lines (+915/-561)40 files modifiedplugin/innobase/btr/btr0btr.cc (+1/-1)
plugin/innobase/btr/btr0cur.cc (+239/-84)
plugin/innobase/btr/btr0sea.cc (+1/-1)
plugin/innobase/buf/buf0buddy.cc (+1/-1)
plugin/innobase/buf/buf0buf.cc (+26/-26)
plugin/innobase/buf/buf0lru.cc (+7/-39)
plugin/innobase/dict/dict0dict.cc (+10/-0)
plugin/innobase/dict/dict0load.cc (+1/-1)
plugin/innobase/fsp/fsp0fsp.cc (+4/-4)
plugin/innobase/handler/ha_innodb.cc (+110/-7)
plugin/innobase/ibuf/ibuf0ibuf.cc (+5/-22)
plugin/innobase/include/btr0cur.h (+41/-6)
plugin/innobase/include/buf0buf.h (+7/-7)
plugin/innobase/include/buf0lru.h (+4/-8)
plugin/innobase/include/dict0mem.h (+6/-0)
plugin/innobase/include/dict0types.h (+0/-5)
plugin/innobase/include/rem0cmp.h (+4/-0)
plugin/innobase/include/rem0cmp.ic (+1/-1)
plugin/innobase/include/row0upd.h (+18/-8)
plugin/innobase/include/srv0srv.h (+18/-0)
plugin/innobase/include/sync0rw.h (+2/-1)
plugin/innobase/include/trx0rseg.h (+1/-3)
plugin/innobase/include/trx0trx.h (+2/-2)
plugin/innobase/include/univ.i (+4/-3)
plugin/innobase/mem/mem0mem.cc (+1/-1)
plugin/innobase/page/page0zip.cc (+1/-1)
plugin/innobase/rem/rem0cmp.cc (+11/-3)
plugin/innobase/row/row0ins.cc (+1/-1)
plugin/innobase/row/row0merge.cc (+47/-23)
plugin/innobase/row/row0purge.cc (+31/-47)
plugin/innobase/row/row0umod.cc (+17/-30)
plugin/innobase/row/row0upd.cc (+31/-16)
plugin/innobase/row/row0vers.cc (+7/-3)
plugin/innobase/srv/srv0srv.cc (+6/-1)
plugin/innobase/srv/srv0start.cc (+8/-5)
plugin/innobase/sync/sync0arr.cc (+2/-2)
plugin/innobase/sync/sync0rw.cc (+10/-9)
plugin/innobase/sync/sync0sync.cc (+216/-173)
plugin/innobase/trx/trx0roll.cc (+2/-2)
plugin/innobase/trx/trx0trx.cc (+11/-14)
Branch information
Recent revisions
- 2552. By Stewart Smith
-
fix compiler warning on some compilers:
plugin/innobase/ srv/srv0srv. cc: In function 'ulint srv_thread_ has_reserved_ slot(srv_ thread_ type)':
plugin/innobase/ srv/srv0srv. cc:1075: error: comparison between signed and unsigned integer expressions [-Wsign-compare] - 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
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:drizzle