lp:~brianaker/drizzle/refactor

Branch merges

Propose for merging

No branches dependent on this one.

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

Drizzle Merge Team: Pending requested 2010-10-22

Diff: 3503 lines (+494/-489)

42 files modified

drizzled/cursor.cc (+79/-79)
drizzled/cursor.h (+11/-9)
drizzled/memory/root.cc (+4/-0)
drizzled/memory/root.h (+2/-0)
drizzled/plugin/storage_engine.cc (+2/-2)
drizzled/plugin/storage_engine.h (+2/-2)
drizzled/table.cc (+2/-2)
drizzled/table/instance.cc (+0/-1)
drizzled/table_share.cc (+4/-4)
plugin/archive/archive_engine.h (+1/-1)
plugin/archive/ha_archive.cc (+28/-28)
plugin/archive/ha_archive.h (+1/-1)
plugin/blackhole/ha_blackhole.cc (+5/-5)
plugin/blackhole/ha_blackhole.h (+1/-1)
plugin/blitzdb/blitzcmp.cc (+3/-3)
plugin/blitzdb/ha_blitz.cc (+41/-41)
plugin/blitzdb/ha_blitz.h (+1/-1)
plugin/csv/ha_tina.cc (+7/-7)
plugin/csv/ha_tina.h (+1/-1)
plugin/filesystem_engine/filesystem_engine.cc (+13/-13)
plugin/filesystem_engine/filesystem_engine.h (+1/-1)
plugin/function_engine/cursor.cc (+10/-10)
plugin/function_engine/cursor.h (+1/-1)
plugin/function_engine/function.cc (+1/-1)
plugin/function_engine/function.h (+1/-1)
plugin/haildb/haildb_engine.cc (+63/-63)
plugin/haildb/haildb_engine.h (+1/-1)
plugin/innobase/handler/ha_innodb.cc (+77/-79)
plugin/innobase/handler/ha_innodb.h (+2/-2)
plugin/memory/ha_heap.cc (+24/-24)
plugin/memory/ha_heap.h (+1/-1)
plugin/myisam/ha_myisam.cc (+40/-40)
plugin/myisam/ha_myisam.h (+1/-1)
plugin/pbms/src/ha_pbms.cc (+4/-4)
plugin/pbms/src/ha_pbms.h (+1/-1)
plugin/pbxt/src/ha_pbxt.cc (+48/-48)
plugin/pbxt/src/ha_pbxt.h (+2/-2)
plugin/pbxt/src/ha_xtsys.cc (+2/-2)
plugin/pbxt/src/ha_xtsys.h (+1/-1)
plugin/schema_engine/schema.h (+1/-1)
plugin/tableprototester/tableprototester.cc (+3/-3)
plugin/tableprototester/tableprototester.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2299. By Brian Aker on 2011-04-30

Dead method removal.

2298. By Brian Aker on 2011-04-29

A couple of additional fixes for the IO Cache name,

2297. By Mark Atwood on 2011-04-29

Merge in Fixes of Brian's IOCACHE.

2296. By Mark Atwood on 2011-04-28

merge ~skinny.moey/drizzle/bug771572
fix Bug #771572: DEFINER clause breaks replication

2295. By Mark Atwood on 2011-04-27

merge from lp:~patrick-crews/drizzle/bug771606_dbqp_repeat

2294. By Mark Atwood on 2011-04-26

merge from Brian's doc-update-column

2293. By Mark Atwood on 2011-04-26

merge of staging to truck

2292. By Patrick Crews on 2011-04-26

Updated translations

2291. By Brian Aker on 2011-04-23

Merge in fix.

2290. By Brian Aker on 2011-04-23

Merge in refactor