lp:~vjsamuel/drizzle/rplugin-mysql-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

Brian Aker: Pending requested 2010-07-06

Vijay Samuel: Pending requested 2010-07-06

Diff: 794 lines (+293/-92)

31 files modified

drizzled/module/loader.cc (+27/-27)
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 (+3/-3)
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/mysql_protocol/mysql_protocol.cc (+98/-4)
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 (+5/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

Merge fixes for variables.test and error printing.

1642. By Vijay Samuel <vijay@vijay> on 2010-06-30

Merge Trunk

1641. By Vijay Samuel <vijay@vijay> on 2010-06-30

Merge fixes for variable.test

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

Merge rplugin-mysql-protocol.

1639. By Monty Taylor on 2010-06-26

Merged in staging changes: Mark's syslog patch and vijay's program_options.

1638. By Monty Taylor on 2010-06-25

Fixes from Brian to increase strictness/correctness, Toru to remove
current_session from blitzdb, a race condition bugfix from Joe Daly,
and moving of when plugins call program_options from Monty.

1637. By Brian Aker <brian@gaz> on 2010-06-22

Merge in changes to call error on bad data input.

1636. By Brian Aker <brian@gaz> on 2010-06-22

Merge in work for count_cuted_fields

1635. By Brian Aker <brian@gaz> on 2010-06-22

Merge up of Brian to trunk. Mainly work on ha_open, and some current_session
work.

1634. By Monty Taylor on 2010-06-21

Merge of the last bits of program_options plugin module integration:
printing help messages.