lp:~stewart/drizzle/misc-cleanups

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle at revision 2631

Stewart Smith (community): Approve on 2013-03-06

Drizzle Trunk: Pending requested 2013-03-04

Diff: 938 lines (+169/-139)

43 files modified

drizzled/base.h (+0/-8)
drizzled/cursor.cc (+1/-0)
drizzled/cursor.h (+2/-2)
drizzled/field.h (+1/-1)
drizzled/ha_commands.cc (+0/-5)
drizzled/handler_structs.h (+4/-3)
drizzled/include.am (+2/-1)
drizzled/item/field.cc (+1/-0)
drizzled/item/subselect.cc (+1/-0)
drizzled/join.cc (+1/-0)
drizzled/key.cc (+1/-0)
drizzled/key.h (+2/-0)
drizzled/key_info.h (+5/-63)
drizzled/key_part_info.h (+61/-0)
drizzled/optimizer/key_field.cc (+1/-0)
drizzled/optimizer/quick_group_min_max_select.cc (+1/-0)
drizzled/optimizer/quick_group_min_max_select.h (+2/-0)
drizzled/optimizer/quick_range_select.h (+3/-0)
drizzled/optimizer/range.cc (+4/-2)
drizzled/optimizer/sum.cc (+1/-0)
drizzled/optimizer/table_read_plan.h (+3/-0)
drizzled/plugin/storage_engine.h (+1/-1)
drizzled/sql_select.cc (+1/-0)
drizzled/sql_select.h (+2/-0)
drizzled/sql_table.cc (+1/-0)
drizzled/sql_yacc.yy (+3/-3)
drizzled/statement/alter_table.cc (+1/-0)
drizzled/table.cc (+3/-2)
drizzled/table.h (+29/-2)
drizzled/table/instance/base.cc (+3/-18)
drizzled/table/instance/base.h (+1/-0)
drizzled/table/singular.cc (+1/-0)
drizzled/table_proto.cc (+6/-16)
plugin/innobase/handler/ha_innodb.cc (+2/-1)
plugin/innobase/handler/handler0alter.cc (+1/-0)
plugin/memory/ha_heap.cc (+2/-1)
plugin/myisam/ha_myisam.cc (+4/-3)
plugin/myisam/mi_range.cc (+2/-1)
plugin/myisam/mi_rkey.cc (+2/-1)
plugin/myisam/mi_rnext.cc (+3/-2)
plugin/myisam/mi_rnext_same.cc (+2/-1)
plugin/storage_engine_api_tester/storage_engine_api_tester.cc (+1/-1)
plugin/tableprototester/tableprototester.cc (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2637. By Stewart Smith on 2013-03-07

fix a condition in ha_myisam::doOpen() that was relying on message::Table::STANDARD being 0 and non-standard tables being non-zero. At least let's not rely on message::Table::STANDARD being 0.

2636. By Stewart Smith on 2013-03-03

rename drizzled/struct.h to drizzled/key_info.h as that's all that is left

2635. By Stewart Smith on 2013-03-03

move the STATUS_ defines over to table.h rather than status.h, as this is where they are used

2634. By Stewart Smith on 2013-03-03

move RegInfo from drizzled/struct.sh to drizzled/table.h - the only place where that structure is used

2633. By Stewart Smith on 2013-03-03

move class KeyPartInfo out of drizzled/structs.h and into the new drizzled/key_part_info.h.

2632. By Stewart Smith on 2013-03-03

remove enum ha_key_alg and replace with the protobuf enum, removing the need to convert to/from it

2631. By Stewart Smith on 2013-03-02

remove unused ha_row_type

2630. By Drizzle Continuous Integration on 2013-02-28

Merge lp:~stewart/drizzle/docs-improvements-1 Build: jenkins-Drizzle-Builder-173

2629. By Drizzle Continuous Integration on 2013-02-28

Merge lp:~stewart/drizzle/remove-more-unireg Build: jenkins-Drizzle-Builder-172

2628. By Drizzle Continuous Integration on 2013-02-28

Merge lp:~stewart/drizzle/move-timed-mutexes Build: jenkins-Drizzle-Builder-171