lp:~dshrews/drizzle/bugs_626566_637590

Branch merges

Propose for merging

No branches dependent on this one.

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

Brian Aker: Needs Information on 2010-09-14

Diff: 104 lines (+29/-4)

1 file modified

drizzled/transaction_services.cc (+29/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #626566: transactions that split GPB in transaction log are not handling a rollback correctly	Medium	Fix Released
Bug #637590: Transaction log threshold should be checking Transaction message size, not Statement	Medium	Fix Released

Link a bug report

Related blueprints

1762. By David Shrewsbury on 2010-09-13

Merge from trunk

1761. By David Shrewsbury on 2010-09-13

Make sure that trx msg threshold is checked against Transaction message size; make sure that segment ids are not reset when they shouldn't be

1760. By lbieber <lbieber@orisndriz08> on 2010-09-13

Merge Joe - fix bug 600032 - Rollback to savepoint not handled correctly in transaction log
Merge Tim Martin - Adapted existing code documentation in decimal.cc into doxygen format

1759. By lbieber <lbieber@orisndriz03> on 2010-09-12

Merge Monty - Adds initial skeleton for sphinx-based documentation. Will eventually hold man pages, developer docs and long-form documentation

1758. By lbieber <lbieber@orisndriz03> on 2010-09-11

Merge Vijay - added utf 8 tamil test case suite and test case for creating a database in tamil
Merge Brian - Small set of refactoring (includes one case of memset on a table object).

1757. By lbieber <lbieber@orisndriz03> on 2010-09-11

Merge Brian - cppcheck fixes and also modifies unique lookup such that we let the OS handle paging for unique checking (instead of trying to mimic it through using a self built IO_CACHE).
Merge Andrew - fix test result for embedded_innodb

1756. By lbieber <lbieber@orisndriz03> on 2010-09-10

Merge Andrew - fix bug 629571 - Trim down some of the drizzle client auto-complete.
Merge Andrew - fix bug 634374 - Fix SHOW FIELDS FROM so that it can identify VARBINARY and TEXT types

1755. By lbieber <lbieber@orisndriz03> on 2010-09-10

Merge Shrews - fix bug 562349 - date and time functions corrupt blob data in pbxt engine

1754. By lbieber <lbieber@orisndriz03> on 2010-09-10

Merge Brian - clean up Heap code

1753. By lbieber <lbieber@orisndriz03> on 2010-09-10

Merge Vijay - fix bug 632589 - change boolean type command line options of embedded_innodb to be the same as other client options