← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
1712
1712
 
1713
1713
  return (ref_pointer_array=
1714
1714
          (Item **)session->getMemRoot()->allocate(sizeof(Item*) * (n_child_sum_items +
1715
 
                                                 item_list.elements +
 
1715
                                                 item_list.size() +
1716
1716
                                                 select_n_having_items +
1717
1717
                                                 select_n_where_fields +
1718
1718
                                                 order_group_num)*5)) == 0;