lp:~vjsamuel/drizzle/rplugin-drizzle-protocol

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development at revision 1645

Monty Taylor: Approve on 2010-07-06

Drizzle Developers: Pending requested 2010-07-06

Brian Aker: Pending requested 2010-07-06

Diff: 558 lines (+165/-58)

29 files modified

drizzled/module/option_context.cc (+32/-3)
drizzled/module/option_context.h (+3/-13)
drizzled/module/option_map.h (+3/-8)
drizzled/option.cc (+1/-1)
drizzled/plugin.h (+2/-2)
plugin/auth_file/auth_file.cc (+1/-1)
plugin/auth_ldap/auth_ldap.cc (+1/-1)
plugin/auth_ldap/test_ldap.sh (+1/-1)
plugin/auth_test/auth_test.cc (+1/-1)
plugin/blitzdb/ha_blitz.cc (+1/-1)
plugin/crc32/crc32udf.cc (+1/-1)
plugin/default_replicator/default_replicator.cc (+1/-1)
plugin/drizzle_protocol/drizzle_protocol.cc (+99/-7)
plugin/errmsg_notify/errmsg_notify.cc (+1/-1)
plugin/filtered_replicator/filtered_replicator.cc (+1/-1)
plugin/logging_stats/tests/t/command-master.opt (+1/-1)
plugin/logging_stats/tests/t/max_session-master.opt (+1/-1)
plugin/logging_stats/tests/t/max_user-master.opt (+1/-1)
plugin/logging_stats/tests/t/slap-master.opt (+1/-1)
plugin/rabbitmq/rabbitmq_log.cc (+1/-1)
plugin/rand_function/rand_function.cc (+1/-1)
plugin/replication_dictionary/module.cc (+1/-1)
plugin/rot13/rot13.cc (+1/-1)
plugin/simple_user_policy/module.cc (+1/-1)
plugin/sleep/sleep.cc (+1/-1)
plugin/syslog/module.cc (+1/-1)
plugin/transaction_log/module.cc (+1/-1)
plugin/version/versionudf.cc (+1/-1)
tests/test-run.pl (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1638. By Vijay Samuel <vijay@vijay> on 2010-07-06

Merge changes for error printing.

1637. By Vijay Samuel <vijay@vijay> on 2010-06-26

Merge fix for syslog module.

1636. By Vijay Samuel <vijay@vijay> on 2010-06-26

Merge Monty's patch for the interface.

1635. By Vijay Samuel <vijay@vijay> on 2010-06-23

Reverted changes.

1634. By Vijay Samuel <vijay@vijay> on 2010-06-23

Merge uncommit.

1633. By Monty Taylor on 2010-06-20

Merge of Patrick's schema_dictionary test changes, Stewart's HA Status
variable move and more module program_options work.

1632. By Monty Taylor on 2010-06-20

Undid attempt at fixing sporadic freebsd issue.

1631. By Monty Taylor on 2010-06-20

Fixed the OSX build. Again.

1630. By Monty Taylor on 2010-06-20

Added sleep call to try to avoid the spurrious socket errors on freebsd.

1629. By Monty Taylor on 2010-06-20

Merged in Brian's const TableIdentifiter work.