← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 18:18:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621181814-4wsfwjgbw49tzq1e
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
351
351
 
352
352
bool Session::add_order_to_list(Item *item, bool asc)
353
353
{
354
 
  return lex().current_select->add_order_to_list(this, item, asc);
 
354
  lex().current_select->add_order_to_list(this, item, asc);
 
355
  return false; // return void
355
356
}
356
357
 
357
358
bool Session::add_group_to_list(Item *item, bool asc)
889
890
                                     bool allocate_lex_string)
890
891
{
891
892
  if (allocate_lex_string)
892
 
    lex_str= (LEX_STRING *)getMemRoot()->allocate(sizeof(LEX_STRING));
 
893
    lex_str= (LEX_STRING *)getMemRoot()->alloc(sizeof(LEX_STRING));
893
894
  lex_str->str= mem_root->strmake(str, length);
894
895
  lex_str->length= length;
895
896
  return lex_str;