← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_derived.cc

  • Committer: Stewart Smith
  • Date: 2009-03-12 14:52:27 UTC
  • mfrom: (931 drizzle)
  • mto: (937.2.1 sparc)
  • mto: This revision was merged to the branch mainline in revision 932.
  • Revision ID: stewart@flamingspork.com-20090312145227-yaxnwfewrkeic5em
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_derived.cc
218
218
                        first_select->group_list.elements),
219
219
                        (order_st *) first_select->order_list.first,
220
220
                        (order_st *) first_select->group_list.first,
221
 
                        first_select->having, (order_st*) NULL,
222
 
                        (first_select->options | session->options |
223
 
                        SELECT_NO_UNLOCK),
 
221
                        first_select->having,
 
222
                        (first_select->options | session->options | SELECT_NO_UNLOCK),
224
223
                        derived_result, unit, first_select);
225
224
    }
226
225