← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/sum.cc

  • Committer: Monty Taylor
  • Date: 2009-12-27 00:49:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1255.
  • Revision ID: mordred@inaugust.com-20091227004903-maw7ktxu6i6hye9b
Moved mem_root functions into drizzled::memory:: namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/sum.cc
40
40
 
41
41
#include <algorithm>
42
42
 
 
43
using namespace drizzled;
43
44
using namespace std;
44
45
 
45
46
extern my_decimal decimal_zero;
46
 
extern drizzled::plugin::StorageEngine *heap_engine;
 
47
extern plugin::StorageEngine *heap_engine;
47
48
 
48
49
/**
49
50
  Prepare an aggregate function item for checking context conditions.
377
378
Item_sum::Item_sum(List<Item> &list) :arg_count(list.elements),
378
379
  forced_const(false)
379
380
{
380
 
  if ((args=(Item**) sql_alloc(sizeof(Item*)*arg_count)))
 
381
  if ((args=(Item**) memory::sql_alloc(sizeof(Item*)*arg_count)))
381
382
  {
382
383
    uint32_t i=0;
383
384
    List_iterator_fast<Item> li(list);
2985
2986
           (for possible order items in temporare tables)
2986
2987
    order - arg_count_order
2987
2988
  */
2988
 
  if (!(args= (Item**) sql_alloc(sizeof(Item*) * arg_count +
 
2989
  if (!(args= (Item**) memory::sql_alloc(sizeof(Item*) * arg_count +
2989
2990
                                 sizeof(order_st*)*arg_count_order)))
2990
2991
    return;
2991
2992