← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

Merge in tdavies order c++ conversion

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
44
44
*/
45
45
static bool add_to_list(Session *session, SQL_LIST &list, Item *item, bool asc)
46
46
{
47
 
  order_st *order;
48
 
  if (!(order = (order_st *) session->alloc(sizeof(order_st))))
 
47
  Order *order;
 
48
  if (!(order = (Order *) session->alloc(sizeof(Order))))
49
49
    return(1);
50
50
  order->item_ptr= item;
51
51
  order->item= &order->item_ptr;
1732
1732
      str->append(STRING_WITH_LEN(" order by "));
1733
1733
      fake_select_lex->print_order(
1734
1734
        str,
1735
 
        (order_st *) fake_select_lex->order_list.first,
 
1735
        (Order *) fake_select_lex->order_list.first,
1736
1736
        query_type);
1737
1737
    }
1738
1738
    fake_select_lex->print_limit(session, str, query_type);
1740
1740
}
1741
1741
 
1742
1742
void Select_Lex::print_order(String *str,
1743
 
                                order_st *order,
 
1743
                                Order *order,
1744
1744
                                enum_query_type query_type)
1745
1745
{
1746
1746
  for (; order; order= order->next)