← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
47
47
/* Stay outside of the namespace because otherwise bison goes nuts */
48
48
int base_sql_lex(ParserType *arg, drizzled::Session *yysession);
49
49
 
50
 
namespace drizzled
51
 
{
 
50
namespace drizzled {
52
51
 
53
52
static int lex_one_token(ParserType *arg, drizzled::Session *yysession);
54
53
 
57
56
*/
58
57
static void add_to_list(Session *session, SQL_LIST &list, Item *item, bool asc)
59
58
{
60
 
  Order* order = (Order *) session->mem.alloc(sizeof(Order));
 
59
  Order* order = new (session->mem) Order;
61
60
  order->item_ptr= item;
62
61
  order->item= &order->item_ptr;
63
62
  order->asc = asc;