← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.h

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.h
138
138
  bool is_created_from_null_item;
139
139
 
140
140
  static void *operator new(size_t size);
141
 
  static void *operator new(size_t size, MEM_ROOT *mem_root);
 
141
  static void *operator new(size_t size, drizzled::memory::Root *mem_root);
142
142
  static void operator delete(void *, size_t)
143
143
  { }
144
144
 
365
365
    return false;
366
366
  }
367
367
  virtual void free() {}
368
 
  virtual Field *new_field(MEM_ROOT *root,
 
368
  virtual Field *new_field(drizzled::memory::Root *root,
369
369
                           Table *new_table,
370
370
                           bool keep_type);
371
 
  virtual Field *new_key_field(MEM_ROOT *root, Table *new_table,
 
371
  virtual Field *new_key_field(drizzled::memory::Root *root, Table *new_table,
372
372
                               unsigned char *new_ptr,
373
373
                               unsigned char *new_null_ptr,
374
374
                               uint32_t new_null_bit);
375
375
  /** This is used to generate a field in Table from TableShare */
376
 
  Field *clone(MEM_ROOT *mem_root, Table *new_table);
 
376
  Field *clone(drizzled::memory::Root *mem_root, Table *new_table);
377
377
  inline void move_field(unsigned char *ptr_arg,unsigned char *null_ptr_arg,unsigned char null_bit_arg)
378
378
  {
379
379
    ptr= ptr_arg;
767
767
/**
768
768
 * A class for quick copying data to fields
769
769
 */
770
 
class CopyField :public Sql_alloc
 
770
class CopyField :public drizzled::memory::SqlAlloc
771
771
{
772
772
  /**
773
773
    Convenience definition of a copy function returned by
798
798
};
799
799
 
800
800
Field *make_field(TableShare *share,
801
 
                  MEM_ROOT *root,
 
801
                  drizzled::memory::Root *root,
802
802
                  unsigned char *ptr,
803
803
                  uint32_t field_length,
804
804
                  bool is_nullable,