← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.h

  • Committer: brian
  • Date: 2009-02-26 20:57:39 UTC
  • mfrom: (896.3.16 nofrm896)
  • mto: This revision was merged to the branch mainline in revision 901.
  • Revision ID: brian@bitters-20090226205739-yv4cbwna6myvkq22
Merge of Stewart + Jay's fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.h
62
62
  void operator=(Field &);
63
63
public:
64
64
  static void *operator new(size_t size) {return sql_alloc(size); }
 
65
  static void *operator new(size_t size, MEM_ROOT *mem_root)
 
66
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
 
67
 
65
68
  static void operator delete(void *, size_t)
66
69
  { TRASH(ptr_arg, size); }
67
70
 
669
672
};
670
673
 
671
674
 
672
 
Field *make_field(TABLE_SHARE *share, unsigned char *ptr, uint32_t field_length,
 
675
Field *make_field(TABLE_SHARE *share, MEM_ROOT *root, unsigned char *ptr, uint32_t field_length,
673
676
                  unsigned char *null_pos, unsigned char null_bit,
674
677
                  uint32_t pack_flag, enum_field_types field_type,
675
678
                  const CHARSET_INFO * cs,