lp:~vjsamuel/drizzle/rplugin-transaction-log

Branch merges

Propose for merging

No branches dependent on this one.

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

Vijay Samuel: Pending requested 2010-08-06

Drizzle Merge Team: Pending requested 2010-08-06

Jay Pipes: Pending requested 2010-08-06

Diff: 337 lines (+103/-35)

35 files modified

plugin/replication_dictionary/tests/t/replication_streams-master.opt (+1/-1)
plugin/transaction_log/module.cc (+69/-1)
plugin/transaction_log/tests/t/alter-master.opt (+1/-1)
plugin/transaction_log/tests/t/auto_commit-master.opt (+1/-1)
plugin/transaction_log/tests/t/bad_replicator-master.opt (+1/-1)
plugin/transaction_log/tests/t/blob-master.opt (+1/-1)
plugin/transaction_log/tests/t/create_select-master.opt (+1/-1)
plugin/transaction_log/tests/t/create_table-master.opt (+1/-1)
plugin/transaction_log/tests/t/database-master.opt (+1/-1)
plugin/transaction_log/tests/t/ddl_transaction_id-master.opt (+1/-1)
plugin/transaction_log/tests/t/delete-master.opt (+1/-1)
plugin/transaction_log/tests/t/filtered_replicator-master.opt (+1/-1)
plugin/transaction_log/tests/t/information_schema-master.opt (+1/-1)
plugin/transaction_log/tests/t/insert-master.opt (+1/-1)
plugin/transaction_log/tests/t/insert_multi-master.opt (+1/-1)
plugin/transaction_log/tests/t/insert_on_duplicate_update-master.opt (+1/-1)
plugin/transaction_log/tests/t/insert_select-master.opt (+1/-1)
plugin/transaction_log/tests/t/multi_column_primary_key-master.opt (+1/-1)
plugin/transaction_log/tests/t/multi_table-master.opt (+1/-1)
plugin/transaction_log/tests/t/no_modification-master.opt (+1/-1)
plugin/transaction_log/tests/t/no_primary_key-master.opt (+1/-1)
plugin/transaction_log/tests/t/null_values-master.opt (+1/-1)
plugin/transaction_log/tests/t/rand-master.opt (+1/-1)
plugin/transaction_log/tests/t/rename-master.opt (+1/-1)
plugin/transaction_log/tests/t/replace-master.opt (+1/-1)
plugin/transaction_log/tests/t/rollback-master.opt (+1/-1)
plugin/transaction_log/tests/t/schema-master.opt (+1/-1)
plugin/transaction_log/tests/t/select_for_update-master.opt (+1/-1)
plugin/transaction_log/tests/t/slap-master.opt (+1/-1)
plugin/transaction_log/tests/t/temp_tables-master.opt (+1/-1)
plugin/transaction_log/tests/t/truncate-master.opt (+1/-1)
plugin/transaction_log/tests/t/truncate_log-master.opt (+1/-1)
plugin/transaction_log/tests/t/udf_print_transaction_message-master.opt (+1/-1)
plugin/transaction_log/tests/t/update-master.opt (+1/-1)
plugin/transaction_log/tests/t/variables-master.opt (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1689. By Vijay Samuel <vijay@vijay> on 2010-08-06

Merge trunk and thank you Monty!

1688. By Vijay Samuel <vijay@vijay> on 2010-08-06

Merge fixes from Monty

1687. By Vijay Samuel <vijay@vijay> on 2010-08-06

Revert previous changes

1686. By Vijay Samuel <vijay@vijay> on 2010-08-04

Merge "possible" fix for failures in CentOS, FreeBSD and Solaris

1685. By Vijay Samuel <vijay@vijay> on 2010-08-04

Merge re factored command line for transaction_log

1684. By Brian Aker <brian@gaz> on 2010-08-03

Removes LOCK_system_variables_hash, one goto, drops internall new for std
new (so possible performance regression), fixes bug where Session was not
unlocked correctly.

1683. By Brian Aker <brian@gaz> on 2010-08-03

Merge Monty/Brian (intltool optional, Tabe Fucntions do case insensitive
comparisons)

1682. By Patrick Crews on 2010-08-03

Rollup patch of Stewart, Monty, and Patrick - various changes

1681. By lbieber <lbieber@orisndriz03> on 2010-08-02

From Monty - Removed our wrappers around unordered_set and unordered_map. Since we're requiring boost at this point, there is really no point

1680. By Brian Aker <brian@gaz> on 2010-08-02

Merge Stwart