← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

updating to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
84
84
#include "drizzled/plugin/storage_engine.h"
85
85
 
86
86
#include "drizzled/definition/cache.h"
 
87
#include "drizzled/typelib.h"
87
88
 
88
89
#include <drizzled/refresh_version.h>
89
90
 
1913
1914
    null_bit= ((unsigned char) 1) << null_bit;
1914
1915
  }
1915
1916
 
1916
 
  switch (field_type) 
1917
 
  {
1918
 
  case DRIZZLE_TYPE_DATE:
1919
 
  case DRIZZLE_TYPE_DATETIME:
1920
 
  case DRIZZLE_TYPE_UUID:
1921
 
    field_charset= &my_charset_bin;
1922
 
  default: break;
1923
 
  }
1924
 
 
1925
1917
  switch (field_type)
1926
1918
  {
1927
1919
  case DRIZZLE_TYPE_ENUM:
2022
2014
                                       field_length,
2023
2015
                                       null_pos,
2024
2016
                                       null_bit,
2025
 
                                       field_name,
2026
 
                                       field_charset);
 
2017
                                       field_name);
2027
2018
  case DRIZZLE_TYPE_DATE:
2028
2019
    return new (&mem_root) Field_date(ptr,
2029
2020
                                 null_pos,
2030
2021
                                 null_bit,
2031
 
                                 field_name,
2032
 
                                 field_charset);
 
2022
                                 field_name);
2033
2023
  case DRIZZLE_TYPE_DATETIME:
2034
2024
    return new (&mem_root) Field_datetime(ptr,
2035
2025
                                     null_pos,
2036
2026
                                     null_bit,
2037
 
                                     field_name,
2038
 
                                     field_charset);
 
2027
                                     field_name);
2039
2028
  case DRIZZLE_TYPE_NULL:
2040
2029
    return new (&mem_root) Field_null(ptr,
2041
 
                                 field_length,
2042
 
                                 field_name,
2043
 
                                 field_charset);
 
2030
                                      field_length,
 
2031
                                      field_name);
2044
2032
  }
2045
2033
  assert(0);
2046
2034
  abort();