← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« 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
31
31
#include "drizzled/sql_bitmap.h"
32
32
#include "drizzled/sql_list.h"
33
33
#include "drizzled/structs.h"
 
34
#include "drizzled/charset_info.h"
34
35
 
35
36
#include <string>
36
37
#include <vector>
46
47
#define ASSERT_COLUMN_MARKED_FOR_WRITE
47
48
#endif
48
49
 
 
50
typedef struct st_typelib TYPELIB;
 
51
 
49
52
const uint32_t max_field_size= (uint32_t) 4294967295U;
50
53
 
51
54
class SendField;
134
137
   */
135
138
  bool is_created_from_null_item;
136
139
 
137
 
  static void *operator new(size_t size) {return sql_alloc(size); }
138
 
  static void *operator new(size_t size, MEM_ROOT *mem_root)
139
 
  { return alloc_root(mem_root, static_cast<uint32_t>(size)); }
 
140
  static void *operator new(size_t size);
 
141
  static void *operator new(size_t size, MEM_ROOT *mem_root);
140
142
  static void operator delete(void *, size_t)
141
 
  { TRASH(ptr_arg, size); }
 
143
  { }
142
144
 
143
145
  Field(unsigned char *ptr_arg,
144
146
        uint32_t length_arg,