← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/func.h

  • Committer: Stewart Smith
  • Date: 2009-08-20 17:15:54 UTC
  • mto: (1119.2.2 merge)
  • mto: This revision was merged to the branch mainline in revision 1124.
  • Revision ID: stewart@flamingspork.com-20090820171554-72eo1tqlc4n64rak
Valgrind 3.5 requires --alignment to be a power of 2 between 16 and 4096. The specifying --alignment is not important for us, so remove it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/func.h
26
26
#include <drizzled/sql_list.h>
27
27
#include <drizzled/item/bin_string.h>
28
28
 
29
 
namespace drizzled
30
 
{
31
29
 
32
30
class Item_func :public Item_result_field
33
31
{
84
82
    allowed_arg_cols(1)
85
83
  {
86
84
    arg_count= 0;
87
 
    if ((args= (Item**) memory::sql_alloc(sizeof(Item*)*3)))
 
85
    if ((args= (Item**) sql_alloc(sizeof(Item*)*3)))
88
86
    {
89
87
      arg_count= 3;
90
88
      args[0]= a; args[1]= b; args[2]= c;
95
93
    allowed_arg_cols(1)
96
94
  {
97
95
    arg_count= 0;
98
 
    if ((args= (Item**) memory::sql_alloc(sizeof(Item*)*4)))
 
96
    if ((args= (Item**) sql_alloc(sizeof(Item*)*4)))
99
97
    {
100
98
      arg_count= 4;
101
99
      args[0]= a; args[1]= b; args[2]= c; args[3]= d;
107
105
    allowed_arg_cols(1)
108
106
  {
109
107
    arg_count= 5;
110
 
    if ((args= (Item**) memory::sql_alloc(sizeof(Item*)*5)))
 
108
    if ((args= (Item**) sql_alloc(sizeof(Item*)*5)))
111
109
    {
112
110
      args[0]= a; args[1]= b; args[2]= c; args[3]= d; args[4]= e;
113
111
      with_sum_func= a->with_sum_func || b->with_sum_func ||
190
188
 
191
189
};
192
190
 
193
 
} /* namespace drizzled */
194
 
 
195
191
 
196
192
#endif /* DRIZZLED_FUNCTION_FUNC_H */