Merge lp://qastaging/~stewart/drizzle/optimizer-explain-std-string into lp://qastaging/drizzle/7.0

Proposed by Stewart Smith
Status: Merged
Approved by: Brian Aker
Approved revision: 2175
Merged at revision: 2176
Proposed branch: lp://qastaging/~stewart/drizzle/optimizer-explain-std-string
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 520 lines (+83/-104)
12 files modified
drizzled/optimizer/explain_plan.cc (+35/-57)
drizzled/optimizer/quick_group_min_max_select.cc (+2/-2)
drizzled/optimizer/quick_group_min_max_select.h (+1/-1)
drizzled/optimizer/quick_index_merge_select.cc (+11/-11)
drizzled/optimizer/quick_index_merge_select.h (+2/-2)
drizzled/optimizer/quick_range_select.cc (+3/-3)
drizzled/optimizer/quick_range_select.h (+2/-2)
drizzled/optimizer/quick_ror_intersect_select.cc (+11/-11)
drizzled/optimizer/quick_ror_intersect_select.h (+2/-2)
drizzled/optimizer/quick_ror_union_select.cc (+8/-8)
drizzled/optimizer/quick_ror_union_select.h (+2/-2)
drizzled/optimizer/range.h (+4/-3)
To merge this branch: bzr merge lp://qastaging/~stewart/drizzle/optimizer-explain-std-string
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+49924@code.qastaging.launchpad.net

Description of the change

some conversions from String to std::string in EXPLAIN codepath...

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/746/

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches