lp:~drizzle-trunk/drizzle/7.1-staging

Created by Brian Aker and last modified
Get this branch:
bzr branch lp:~drizzle-trunk/drizzle/7.1-staging
Members of Drizzle Trunk can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Drizzle Trunk
Project:
Drizzle
Status:
Development

Recent revisions

2552. By Brian Aker

Selectively fix docs (patch by Henrik).

2551. By Drizzle Continuous Integration

added:
  po/bs.po
modified:
  po/pl.po
  po/pt_BR.po
  po/zh_CN.po
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-05-28 [merge] Update translations

2550. By Drizzle Continuous Integration

removed:
  plugin/innobase/include/thr0loc.h
  plugin/innobase/include/thr0loc.ic
  plugin/innobase/thr/thr0loc.cc
added:
  plugin/innobase/include/ut0bh.h
  plugin/innobase/include/ut0bh.ic
  plugin/innobase/ut/ut0bh.cc
modified:
  plugin/innobase/CMakeLists.txt
  plugin/innobase/btr/btr0btr.cc
  plugin/innobase/btr/btr0cur.cc
  plugin/innobase/btr/btr0sea.cc
  plugin/innobase/buf/buf0buddy.cc
  plugin/innobase/buf/buf0buf.cc
  plugin/innobase/buf/buf0flu.cc
  plugin/innobase/buf/buf0lru.cc
  plugin/innobase/buf/buf0rea.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/dict/dict0load.cc
  plugin/innobase/dict/dict0mem.cc
  plugin/innobase/fil/fil0fil.cc
  plugin/innobase/fsp/fsp0fsp.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/handler/handler0alter.cc
  plugin/innobase/handler/internal_dictionary.cc
  plugin/innobase/handler/replication_dictionary.cc
  plugin/innobase/handler/replication_log.cc
  plugin/innobase/ibuf/ibuf0ibuf.cc
  plugin/innobase/include/btr0btr.h
  plugin/innobase/include/btr0cur.h
  plugin/innobase/include/btr0pcur.h
  plugin/innobase/include/btr0pcur.ic
  plugin/innobase/include/btr0types.h
  plugin/innobase/include/buf0buf.h
  plugin/innobase/include/buf0flu.h
  plugin/innobase/include/buf0lru.h
  plugin/innobase/include/buf0rea.h
  plugin/innobase/include/data0data.h
  plugin/innobase/include/data0data.ic
  plugin/innobase/include/dict0dict.h
  plugin/innobase/include/dict0dict.ic
  plugin/innobase/include/dict0load.h
  plugin/innobase/include/dict0mem.h
  plugin/innobase/include/dict0types.h
  plugin/innobase/include/ha_prototypes.h
  plugin/innobase/include/ibuf0ibuf.h
  plugin/innobase/include/ibuf0ibuf.ic
  plugin/innobase/include/mem0mem.h
  plugin/innobase/include/mem0mem.ic
  plugin/innobase/include/mtr0mtr.h
  plugin/innobase/include/mtr0mtr.ic
  plugin/innobase/include/os0file.h
  plugin/innobase/include/page0page.h
  plugin/innobase/include/page0zip.h
  plugin/innobase/include/rem0cmp.h
  plugin/innobase/include/rem0cmp.ic
  plugin/innobase/include/rem0rec.h
  plugin/innobase/include/rem0rec.ic
  plugin/innobase/include/row0upd.h
  plugin/innobase/include/srv0srv.h
  plugin/innobase/include/sync0arr.h
  plugin/innobase/include/sync0rw.h
  plugin/innobase/include/sync0sync.h
  plugin/innobase/include/trx0purge.h
  plugin/innobase/include/trx0rseg.h
  plugin/innobase/include/trx0sys.h
  plugin/innobase/include/trx0sys.ic
  plugin/innobase/include/trx0trx.h
  plugin/innobase/include/univ.i
  plugin/innobase/include/ut0ut.h
  plugin/innobase/include/ut0vec.h
  plugin/innobase/include/ut0vec.ic
  plugin/innobase/lock/lock0lock.cc
  plugin/innobase/log/log0recv.cc
  plugin/innobase/mem/mem0dbg.cc
  plugin/innobase/mem/mem0mem.cc
  plugin/innobase/mtr/mtr0mtr.cc
  plugin/innobase/os/os0file.cc
  plugin/innobase/page/page0cur.cc
  plugin/innobase/page/page0page.cc
  plugin/innobase/page/page0zip.cc
  plugin/innobase/plugin.am
  plugin/innobase/rem/rem0cmp.cc
  plugin/innobase/row/row0ins.cc
  plugin/innobase/row/row0merge.cc
  plugin/innobase/row/row0mysql.cc
  plugin/innobase/row/row0purge.cc
  plugin/innobase/row/row0umod.cc
  plugin/innobase/row/row0upd.cc
  plugin/innobase/row/row0vers.cc
  plugin/innobase/srv/srv0srv.cc
  plugin/innobase/srv/srv0start.cc
  plugin/innobase/sync/sync0arr.cc
  plugin/innobase/sync/sync0rw.cc
  plugin/innobase/sync/sync0sync.cc
  plugin/innobase/trx/trx0i_s.cc
  plugin/innobase/trx/trx0purge.cc
  plugin/innobase/trx/trx0roll.cc
  plugin/innobase/trx/trx0rseg.cc
  plugin/innobase/trx/trx0sys.cc
  plugin/innobase/trx/trx0trx.cc
  plugin/innobase/ut/ut0dbg.cc
  plugin/innobase/ut/ut0ut.cc
  plugin/innobase/xtrabackup/xtrabackup.cc
pending merge tips: (use -v to see all merge revisions)
  Stewart Smith 2012-05-23 Merge InnoDB from MySQL 5.5.12 (no InnoDB version bump)

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

2546. By Drizzle Continuous Integration

modified:
  plugin/rabbitmq/rabbitmq_log.cc

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/regression/r/986455.result
  tests/suite/regression/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
This branch contains Public information 
Everyone can see this information.

Subscribers