← Back to branch summary

~mordred/drizzle/fix-bell-bugs

« back to all changes in this revision

Viewing changes to drizzled/field.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
43
43
#include "drizzled/field/datetime.h"
44
44
#include "drizzled/field/varstring.h"
45
45
#include "drizzled/time_functions.h"
 
46
#include "drizzled/internal/m_string.h"
46
47
 
47
48
/*****************************************************************************
48
49
  Instansiate templates and static variables
49
50
*****************************************************************************/
50
51
 
51
 
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
52
 
template class List<CreateField>;
53
 
template class List_iterator<CreateField>;
54
 
#endif
55
 
 
56
52
static enum_field_types
57
53
field_types_merge_rules [DRIZZLE_TYPE_MAX+1][DRIZZLE_TYPE_MAX+1]=
58
54
{
367
363
  return (str < strend);
368
364
}
369
365
 
 
366
void *Field::operator new(size_t size)
 
367
{
 
368
  return sql_alloc(size);
 
369
}
 
370
 
 
371
void *Field::operator new(size_t size, MEM_ROOT *mem_root)
 
372
{
 
373
  return alloc_root(mem_root, static_cast<uint32_t>(size));
 
374
}
 
375
 
370
376
enum_field_types Field::field_type_merge(enum_field_types a,
371
377
                                         enum_field_types b)
372
378
{