lp:~dshrews/drizzle/bug651228

Branch merges

Propose for merging

No branches dependent on this one.

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

Monty Taylor: Approve on 2010-10-08

Diff: 19 lines (+2/-0)

1 file modified

drizzled/message/transaction.proto (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #651228: Add 'catalog' attribute to GPB messages

Low

Fix Released

Link a bug report

Related blueprints

1825. By David Shrewsbury on 2010-10-08

Set bug fix

1824. By David Shrewsbury on 2010-10-08

Add catalog attribute to remaining GPB statements

1823. By lbieber <lbieber@orisndriz08> on 2010-10-08

Merge Brian - When we were dropping a table we were doing a lookup that we no longer need to do.
Merge Shrews - fix bug 656474: transaction_reader not outputting ROLLBACKs

1822. By lbieber <lbieber@orisndriz08> on 2010-10-08

Merge Monty - Fixed the last of the ICC warnings. Turned on warnings=errors
Merge Brian - fixu bug #655558: SELECT 102/(1-1) should error on divide by zero
Merge Brian - fix bug #654219: information_schema.key_column_usage does not contain information about FKs

1821. By lbieber <lbieber@orisndriz08> on 2010-10-07

Merge Lee - Fix output of haildb_version_func test
Merge Brian - Fix to be able to enable our own port alongside the MySQL port.

1820. By lbieber <lbieber@orisndriz08> on 2010-10-07

Merge Monty - Bug 655294: load_data() function returns null if file is invalid
Merge Monty - Bug 655342: select into outfile creates a garbage file on no results
Merge Monty - Fixes the haildb build

1819. By lbieber <lbieber@orisndriz08> on 2010-10-07

Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

1818. By lbieber <lbieber@orisndriz08> on 2010-10-06

Merge Monty - First pass at our own custom config file parser to work around bugs in the ubuntu lucid version of boost
Merge Patrick G. - Fix to compile on OS X
Merge Joe - make transaction_message_threshold configurable on the command line

1817. By lbieber <lbieber@orisndriz08> on 2010-10-06

Merge Monty - Change the requirement from either libinnodb to libhaildb. Also, tied it to version 2.2
Merge Andrew - fix bug 650935: remove --compress from all clients
Merge Andrew - fix bug 653471: Add -A to drizzle client
Merge Travis - 621861 = To change C structs to C++ classes in Drizzle

1816. By lbieber <lbieber@orisndriz08> on 2010-10-06

Merge Shrews - Add options to the GPB files that will be used by protoc when generating Java source files.
Merge Andrew - fix bug 654568: Pandora --enable/disable message for plugins incorrect
Merge Andrew - fix bug 653707: drizzle --shutdown reading table information