← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.h

Merge in tdavies order c++ conversion

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.h
195
195
  List<Item> tmp_fields_list3;
196
196
  int error;
197
197
 
198
 
  order_st *order;
199
 
  order_st *group_list; /**< hold parameters of mysql_select */
 
198
  Order *order;
 
199
  Order *group_list; /**< hold parameters of mysql_select */
200
200
  COND *conds;                            // ---"---
201
201
  Item *conds_history; /**< store WHERE for explain */
202
202
  TableList *tables_list; /**< hold 'tables' parameter of mysql_select */
403
403
              uint32_t wind_num,
404
404
              COND *conds,
405
405
              uint32_t og_num,
406
 
              order_st *order,
407
 
              order_st *group,
 
406
              Order *order,
 
407
              Order *group,
408
408
              Item *having,
409
409
              Select_Lex *select,
410
410
              Select_Lex_Unit *unit);