← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

Merged fix-headers work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
27
27
#include <drizzled/item/cmpfunc.h>
28
28
#include <drizzled/cached_item.h>
29
29
#include <drizzled/functions/bit.h>
 
30
#include <drizzled/check_stack_overrun.h>
30
31
 
31
32
#include CMATH_H
32
33
 
2714
2715
    buff should match stack usage from
2715
2716
    Item_func_case::val_int() -> Item_func_case::find_item()
2716
2717
  */
2717
 
  unsigned char buff[MAX_FIELD_WIDTH*2+sizeof(String)*2+sizeof(String*)*2+sizeof(double)*2+sizeof(int64_t)*2];
 
2718
  unsigned char buff[MAX_FIELD_WIDTH*2+sizeof(String)*2+sizeof(String*)*2
 
2719
                     +sizeof(double)*2+sizeof(int64_t)*2];
2718
2720
  bool res= Item_func::fix_fields(session, ref);
2719
2721
  /*
2720
2722
    Call check_stack_overrun after fix_fields to be sure that stack variable