lp:~posulliv/drizzle/bug621875

Branch merges

Propose for merging

No branches dependent on this one.

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

Drizzle Merge Team: Pending requested 2010-10-07

Diff: 3068 lines (+549/-815) (has conflicts)

58 files modified

drizzled/cursor.cc (+1/-4)
drizzled/cursor.h (+2/-3)
drizzled/definitions.h (+3/-0)
drizzled/field.h (+0/-1)
drizzled/filesort.cc (+5/-4)
drizzled/function/math/round.cc (+1/-0)
drizzled/function/time/weekday.cc (+1/-0)
drizzled/include.am (+0/-2)
drizzled/item.h (+0/-1)
drizzled/item/cache.h (+1/-0)
drizzled/item/field.cc (+6/-3)
drizzled/item/int.h (+1/-0)
drizzled/item/subselect.h (+1/-0)
drizzled/key.cc (+7/-4)
drizzled/key.h (+2/-2)
drizzled/nested_join.h (+0/-1)
drizzled/optimizer/quick_index_merge_select.cc (+1/-1)
drizzled/optimizer/quick_index_merge_select.h (+2/-1)
drizzled/optimizer/quick_range_select.cc (+12/-30)
drizzled/optimizer/quick_range_select.h (+5/-5)
drizzled/optimizer/quick_ror_intersect_select.cc (+1/-1)
drizzled/optimizer/quick_ror_intersect_select.h (+2/-1)
drizzled/optimizer/quick_ror_union_select.cc (+1/-1)
drizzled/optimizer/quick_ror_union_select.h (+1/-1)
drizzled/optimizer/range.cc (+166/-174)
drizzled/optimizer/range.h (+1/-1)
drizzled/optimizer/range_param.h (+52/-4)
drizzled/optimizer/sel_arg.cc (+1/-0)
drizzled/optimizer/sel_tree.h (+3/-2)
drizzled/optimizer/table_read_plan.h (+4/-5)
drizzled/order.h (+0/-1)
drizzled/sql_base.cc (+3/-4)
drizzled/sql_bitmap.h (+0/-368)
drizzled/sql_insert.cc (+7/-6)
drizzled/sql_update.cc (+19/-21)
drizzled/table.cc (+54/-44)
drizzled/table.h (+25/-28)
drizzled/table_reference.h (+1/-1)
drizzled/table_share.cc (+15/-28)
drizzled/table_share.h (+2/-5)
plugin/pbms/src/compactor_ms.cc (+2/-1)
plugin/pbms/src/connection_handler_ms.cc (+8/-5)
plugin/pbms/src/connection_handler_ms.h (+2/-1)
plugin/pbms/src/database_ms.h (+4/-4)
plugin/pbms/src/defs_ms.h (+3/-1)
plugin/pbms/src/engine_ms.h (+8/-0)
plugin/pbms/src/network_ms.cc (+5/-2)
plugin/pbms/src/network_ms.h (+1/-1)
plugin/pbms/src/open_table_ms.cc (+9/-5)
plugin/pbms/src/open_table_ms.h (+4/-4)
plugin/pbms/src/table_ms.cc (+3/-3)
plugin/pbms/src/temp_log_ms.cc (+4/-4)
plugin/pbms/src/temp_log_ms.h (+3/-1)
plugin/pbms/src/transaction_ms.cc (+5/-4)
plugin/pbxt/src/ha_pbxt.cc (+43/-6)
plugin/pbxt/src/index_xt.h (+5/-1)
plugin/pbxt/src/myxt_xt.cc (+24/-9)
plugin/pbxt/src/xt_defs.h (+7/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #492950: icc warnings on my_bitmap	Medium	Fix Released
Bug #621875: replace my_bitmap	Low	Fix Released

Link a bug report

Related blueprints

1823. By Padraig O'Sullivan on 2010-10-07

Fix for memory leak in pbxt.

1822. By Padraig O'Sullivan on 2010-10-07

Merge with trunk.

1821. By Padraig O'Sullivan on 2010-10-05

Fix for test case failure.

1820. By Padraig O'Sullivan on 2010-10-05

Whoops, had a string constructor parameters in the wrong order.

1819. By Padraig O'Sullivan on 2010-10-05

Hack to fix memory leak. This is horrible but lets us get rid of MyBitmap. This hack is needed for now to prevent a memory leak that occurs because mem_root does not always call desctructors of the objects it allocates memory for. The long term solution to this is to remove the use of mem_root from the optimizer. Once that is done, this hack can be taken back out again which I will very gladly do...

1818. By Padraig O'Sullivan on 2010-10-05

Convert struct to class and move it into optimizer namespace.

1817. By Padraig O'Sullivan on 2010-10-04

Fix a memory leak and remove code at the same time. Function for allocating memory for an object was unneeded since it was only ever called once.

1816. By Padraig O'Sullivan on 2010-10-03

Resolved memory leaks by freeing memory in destructors of certain structs in the range optimizer.

1815. By Padraig O'Sullivan on 2010-10-02

Fixes for pbms compile errors after removing MyBitmap.

1814. By Padraig O'Sullivan on 2010-10-02

Merge trunk.