lp:~linuxjedi/drizzle/drizzle-bug-634374-embedded-innodb

Branch merges

Propose for merging

No branches dependent on this one.

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

Stewart Smith (community): Approve on 2010-09-10

Drizzle Merge Team: Pending requested 2010-09-10

Diff: 288 lines (+42/-39)

8 files modified

plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/type_blob.result (+3/-3)
plugin/schema_dictionary/tests/r/show.result (+20/-20)
plugin/show_dictionary/show_columns.cc (+8/-5)
plugin/show_dictionary/show_columns.h (+1/-1)
tests/r/type_blob.result (+3/-3)
tests/r/type_datetime.result (+2/-2)
tests/r/type_ranges.result (+3/-3)
tests/r/union.result (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #634374: "SHOW FIELDS FROM" TEXT type wrong

Medium

Fix Released

Link a bug report

Related blueprints

1756. By Andrew Hutchings on 2010-09-10

Fixed embedded innodb test case

1755. By Andrew Hutchings on 2010-09-10

Fix test cases

1754. By Andrew Hutchings on 2010-09-10

Use collation in SHOW FIELDS FROM so that it can detect the difference beween TEXT and BLOB (and VARCHAR/VARBINARY)

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

1752. By lbieber <lbieber@orisndriz03> on 2010-09-09

Merge Joe - Remove old write_bin_log_drop_table() function use GPB and transaction_services to do this

1751. By lbieber <lbieber@orisndriz03> on 2010-09-09

Merge Andrew - fix bug 621603: Connections status variable off by one
Merge Andrew - fix bug 621947: show processlist filldown
Merge Andrew - fix bug 628284: --mysql option broken

1750. By lbieber <lbieber@orisndriz03> on 2010-09-08

Merge Andrew - fix bug 619591 - needed to clean up embedded innodb test results
Merge Lee - fix bug 628336 - Remove unused error messages

1749. By lbieber <lbieber@orisndriz03> on 2010-09-08

Merge Andrew - fix bug 628419 - A double free was possible during a range query cleanup
Merge Andrew - fix bug 550251 - If an error occurred during results fetch in drizzle client the result set was not freed correctly ending in segfault upon client end.
Merge Andrew - fix bug 619591 - In SHOW CREATE TABLE type (INT, VARCHAR, etc...) is now uppercase and Collation is now shown for VARCHAR columns

1748. By lbieber <lbieber@orisndriz03> on 2010-09-07

Merge Andrew - bug 597778 - Timestamp cannot reliably store leap seconds, so don't try. Leave that to datetime only
Merge Andrew - bug 621862 - Add / clean-up error messages for unireg_abort
Merge Andrew - bug 629563 - Drop the broken --mysql options and Change the --protocol option to accept 'mysql' or 'drizzle' ('mysql' currently default)

1747. By lbieber <lbieber@orisndriz03> on 2010-09-07

Merge Shrews - fix bug 629360 - Valgrind warning in transaction log protobuf