← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 19:11:23 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621191123-hddduaww44ntgdx5
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
1609
1609
  add_to_list(session, order_list, item, asc);
1610
1610
}
1611
1611
 
1612
 
bool Select_Lex::add_item_to_list(Session *, Item *item)
 
1612
void Select_Lex::add_item_to_list(Session *, Item *item)
1613
1613
{
1614
1614
        item_list.push_back(item);
1615
 
  return false; // return void
1616
1615
}
1617
1616
 
1618
 
bool Select_Lex::add_group_to_list(Session *session, Item *item, bool asc)
 
1617
void Select_Lex::add_group_to_list(Session *session, Item *item, bool asc)
1619
1618
{
1620
1619
  add_to_list(session, group_list, item, asc);
1621
 
  return false; // return void
1622
1620
}
1623
1621
 
1624
1622
Select_Lex_Unit* Select_Lex::master_unit()
1658
1656
  return &item_list;
1659
1657
}
1660
1658
 
1661
 
 
1662
 
bool Select_Lex::setup_ref_array(Session *session, uint32_t order_group_num)
 
1659
void Select_Lex::setup_ref_array(Session *session, uint32_t order_group_num)
1663
1660
{
1664
 
  if (ref_pointer_array)
1665
 
    return false;
1666
 
  ref_pointer_array= (Item **)session->mem.alloc(sizeof(Item*) * (n_child_sum_items + item_list.size() + select_n_having_items + select_n_where_fields + order_group_num)*5);
1667
 
  return false; // return void
 
1661
  if (not ref_pointer_array)
 
1662
    ref_pointer_array= (Item **)session->mem.alloc(sizeof(Item*) * (n_child_sum_items + item_list.size() + select_n_having_items + select_n_where_fields + order_group_num)*5);
1668
1663
}
1669
1664
 
1670
1665
void Select_Lex_Unit::print(String *str)