← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.h

  • Committer: Brian Aker
  • Date: 2009-02-26 16:09:56 UTC
  • mfrom: (898.1.1 fix-osx)
  • Revision ID: brian@tangent.org-20090226160956-52o8ipok9tihh3r5
Merge Monty

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
 
 
68
65
  static void operator delete(void *, size_t)
69
66
  { TRASH(ptr_arg, size); }
70
67
 
672
669
};
673
670
 
674
671
 
675
 
Field *make_field(TABLE_SHARE *share, MEM_ROOT *root, unsigned char *ptr, uint32_t field_length,
 
672
Field *make_field(TABLE_SHARE *share, unsigned char *ptr, uint32_t field_length,
676
673
                  unsigned char *null_pos, unsigned char null_bit,
677
674
                  uint32_t pack_flag, enum_field_types field_type,
678
675
                  const CHARSET_INFO * cs,