← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/subselect.cc

Merge in tdavies order c++ conversion

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/subselect.cc
268
268
    {
269
269
      List_iterator<Item> li(lex->item_list);
270
270
      Item *item;
271
 
      order_st *order;
 
271
      Order *order;
272
272
 
273
273
      if (lex->where && (lex->where)->walk(processor, walk_subquery, argument))
274
274
        return 1;
281
281
        if (item->walk(processor, walk_subquery, argument))
282
282
          return 1;
283
283
      }
284
 
      for (order= (order_st*) lex->order_list.first ; order; order= order->next)
 
284
      for (order= (Order*) lex->order_list.first ; order; order= order->next)
285
285
      {
286
286
        if ((*order->item)->walk(processor, walk_subquery, argument))
287
287
          return 1;
288
288
      }
289
 
      for (order= (order_st*) lex->group_list.first ; order; order= order->next)
 
289
      for (order= (Order*) lex->group_list.first ; order; order= order->next)
290
290
      {
291
291
        if ((*order->item)->walk(processor, walk_subquery, argument))
292
292
          return 1;
2039
2039
                    select_lex->where,
2040
2040
                    select_lex->order_list.elements +
2041
2041
                    select_lex->group_list.elements,
2042
 
                    (order_st*) select_lex->order_list.first,
2043
 
                    (order_st*) select_lex->group_list.first,
 
2042
                    (Order*) select_lex->order_list.first,
 
2043
                    (Order*) select_lex->group_list.first,
2044
2044
                    select_lex->having,
2045
2045
                    select_lex, select_lex->master_unit()))
2046
2046
    return 1;