lp:~mordred/drizzle/bug615046

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development

Drizzle Merge Team: Pending requested 2010-08-17

Diff: 626 lines (+51/-397)

18 files modified

Makefile.am (+3/-0)
config/pandora-plugin (+8/-1)
m4/pandora_canonical.m4 (+2/-2)
plugin/archive/plugin.ini (+1/-0)
plugin/auth_ldap/plugin.ini (+5/-0)
plugin/auth_pam/plugin.ini (+1/-0)
plugin/blitzdb/plugin.ini (+1/-0)
plugin/default_replicator/plugin.ini (+1/-0)
plugin/embedded_innodb/plugin.ini (+1/-0)
plugin/filesystem_engine/plugin.ini (+1/-0)
plugin/innobase/Makefile.am (+0/-342)
plugin/innobase/compile-innodb (+0/-24)
plugin/innobase/compile-innodb-debug (+0/-24)
plugin/innobase/ha_innodb.def (+0/-4)
plugin/innobase/plugin.ini (+7/-0)
plugin/memcached_functions/plugin.ini (+1/-0)
plugin/pbms/plugin.ini (+7/-0)
plugin/pbxt/plugin.ini (+12/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #615046: files missing from tarball dist

Low

Fix Released

Link a bug report

Related blueprints

1714. By Monty Taylor on 2010-08-17

Added files to the tarball that should be there. Removed some that shouldn't
be.

1713. By Monty Taylor on 2010-08-17

Rollup merge.

1712. By Monty Taylor on 2010-08-17

boost::program_options for InnoDB.

1711. By Brian Aker on 2010-08-14

Merge Stewart.

1710. By Brian Aker on 2010-08-13

Style fixes/etc in heap.

1709. By Brian Aker on 2010-08-13

Merge MyISAM changes.

1708. By Brian Aker on 2010-08-13

MErge Joe

1707. By Brian Aker on 2010-08-12

Merge for lp611379

1706. By Brian Aker on 2010-08-12

Remove sync() call.

1705. By Brian Aker on 2010-08-12

Merge in removal of pthread dead wrappers.