← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_subselect.cc

  • Committer: Brian Aker
  • Date: 2008-08-18 20:57:01 UTC
  • mto: This revision was merged to the branch mainline in revision 352.
  • Revision ID: brian@tangent.org-20080818205701-rzeyd4qw4xj7wx7l
Refactoring of class Table

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_subselect.cc
230
230
    {
231
231
      List_iterator<Item> li(lex->item_list);
232
232
      Item *item;
233
 
      ORDER *order;
 
233
      order_st *order;
234
234
 
235
235
      if (lex->where && (lex->where)->walk(processor, walk_subquery, argument))
236
236
        return 1;
243
243
        if (item->walk(processor, walk_subquery, argument))
244
244
          return 1;
245
245
      }
246
 
      for (order= (ORDER*) lex->order_list.first ; order; order= order->next)
 
246
      for (order= (order_st*) lex->order_list.first ; order; order= order->next)
247
247
      {
248
248
        if ((*order->item)->walk(processor, walk_subquery, argument))
249
249
          return 1;
250
250
      }
251
 
      for (order= (ORDER*) lex->group_list.first ; order; order= order->next)
 
251
      for (order= (order_st*) lex->group_list.first ; order; order= order->next)
252
252
      {
253
253
        if ((*order->item)->walk(processor, walk_subquery, argument))
254
254
          return 1;
1613
1613
  {
1614
1614
    /*
1615
1615
      IN/SOME/ALL/ANY subqueries aren't support LIMIT clause. Without it
1616
 
      ORDER BY clause becomes meaningless thus we drop it here.
 
1616
      order_st BY clause becomes meaningless thus we drop it here.
1617
1617
    */
1618
1618
    SELECT_LEX *sl= current->master_unit()->first_select();
1619
1619
    for (; sl; sl= sl->next_select())
2010
2010
                    select_lex->where,
2011
2011
                    select_lex->order_list.elements +
2012
2012
                    select_lex->group_list.elements,
2013
 
                    (ORDER*) select_lex->order_list.first,
2014
 
                    (ORDER*) select_lex->group_list.first,
 
2013
                    (order_st*) select_lex->order_list.first,
 
2014
                    (order_st*) select_lex->group_list.first,
2015
2015
                    select_lex->having,
2016
 
                    (ORDER*) 0, select_lex,
 
2016
                    (order_st*) 0, select_lex,
2017
2017
                    select_lex->master_unit()))
2018
2018
    return 1;
2019
2019
  thd->lex->current_select= save_select;