lp:~dshrews/drizzle/bug686781

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle/7.0 at revision 2076

Drizzle Developers: Pending requested 2011-01-11

Diff: 3253 lines (+1180/-248)

25 files modified

drizzled/message/transaction.proto (+27/-1)
drizzled/transaction_services.cc (+158/-236)
drizzled/transaction_services.h (+12/-11)
plugin/transaction_log/tests/r/bug660779.result (+6/-0)
plugin/transaction_log/tests/r/bug686781.result (+507/-0)
plugin/transaction_log/tests/r/bulk_commit.result (+6/-0)
plugin/transaction_log/tests/r/bulk_rollback.result (+6/-0)
plugin/transaction_log/tests/r/ddl_transaction_id.result (+12/-0)
plugin/transaction_log/tests/r/information_schema.result (+10/-0)
plugin/transaction_log/tests/r/rollback_statement.result (+6/-0)
plugin/transaction_log/tests/r/savepoint.result (+4/-0)
plugin/transaction_log/tests/r/transaction_log_alter.result (+58/-0)
plugin/transaction_log/tests/r/transaction_log_create.result (+36/-0)
plugin/transaction_log/tests/r/transaction_log_data_type.result (+172/-0)
plugin/transaction_log/tests/r/transaction_log_delete.result (+22/-0)
plugin/transaction_log/tests/r/transaction_log_drop.result (+10/-0)
plugin/transaction_log/tests/r/transaction_log_large_blob.result (+2/-0)
plugin/transaction_log/tests/r/transaction_log_loaddata.result (+2/-0)
plugin/transaction_log/tests/r/transaction_log_replace.result (+8/-0)
plugin/transaction_log/tests/r/transaction_log_rollback.result (+2/-0)
plugin/transaction_log/tests/r/transaction_log_schema.result (+12/-0)
plugin/transaction_log/tests/r/transaction_log_transaction.result (+28/-0)
plugin/transaction_log/tests/r/transaction_log_update.result (+38/-0)
plugin/transaction_log/tests/t/bug686781-master.opt (+1/-0)
plugin/transaction_log/tests/t/bug686781.test (+35/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #686781: Transaction message segmenting does not work in all cases

Medium

Fix Released

Link a bug report

Related blueprints

2073. By David Shrewsbury on 2011-01-11

Merge trunk

2072. By David Shrewsbury on 2011-01-11

Actually use segment info in Transaction message. Cleanup TransactionServices::getXYZStatement() method to a simpler form.

2071. By David Shrewsbury on 2011-01-11

Merge trunk

2070. By David Shrewsbury on 2011-01-11

Add segment info to Transaction message and re-record tests.

2069. By Brian Aker on 2011-01-10

MErge in work from proto tree

2068. By Lee Bieber on 2011-01-09

Merge Andrews - fix bug 673833: Embedded SELECT inside UPDATE or DELETE can timeout without error
Merge Andrews - fix bug 700099: serveral issues with InnoDB settings

2067. By Brian Aker on 2011-01-09

Merge in stewart

2066. By Brian Aker on 2011-01-09

Rollup of changes from staging.

2065. By Brian Aker on 2011-01-08

Rollup of retry removal.

2064. By Brian Aker on 2011-01-08

Merge in fractional seconds to timestamp.