← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_derived.cc

  • Committer: Brian Aker
  • Date: 2010-11-02 18:37:09 UTC
  • mfrom: (1897.2.5 merge)
  • Revision ID: brian@tangent.org-20101102183709-n4qjmcju1ozku9ki
Merge of Andrew, tdavies

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
214
214
                        first_select->item_list, first_select->where,
215
215
                        (first_select->order_list.elements+
216
216
                        first_select->group_list.elements),
217
 
                        (order_st *) first_select->order_list.first,
218
 
                        (order_st *) first_select->group_list.first,
 
217
                        (Order *) first_select->order_list.first,
 
218
                        (Order *) first_select->group_list.first,
219
219
                        first_select->having,
220
220
                        (first_select->options | session->options | SELECT_NO_UNLOCK),
221
221
                        derived_result, unit, first_select);