← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Mark Atwood
  • Date: 2011-08-17 06:03:11 UTC
  • mfrom: (2398.1.1 drizzle-IPv6Address)
  • Revision ID: me@mark.atwood.name-20110817060311-ujuf1695rwsnfowu
merge lp:~mumair/drizzle/drizzle-IPV6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
80
80
#include <drizzled/field/microtime.h>
81
81
#include <drizzled/field/varstring.h>
82
82
#include <drizzled/field/uuid.h>
 
83
#include <drizzled/field/ipv6.h>
83
84
#include <drizzled/plugin/storage_engine.h>
84
85
#include <drizzled/definition/cache.h>
85
86
#include <drizzled/typelib.h>
132
133
  case message::Table::Field::UUID:
133
134
    return  DRIZZLE_TYPE_UUID;
134
135
 
 
136
  case message::Table::Field::IPV6:
 
137
    return  DRIZZLE_TYPE_IPV6;
 
138
 
135
139
  case message::Table::Field::BOOLEAN:
136
140
    return DRIZZLE_TYPE_BOOLEAN;
137
141
 
185
189
  case DRIZZLE_TYPE_DATE:
186
190
  case DRIZZLE_TYPE_ENUM:
187
191
  case DRIZZLE_TYPE_UUID:
 
192
  case DRIZZLE_TYPE_IPV6:
188
193
  case DRIZZLE_TYPE_MICROTIME:
189
194
  case DRIZZLE_TYPE_BOOLEAN:
190
195
    default_item= new Item_string(default_value->c_str(),
1162
1167
    case DRIZZLE_TYPE_UUID:
1163
1168
      field_length= field::Uuid::max_string_length();
1164
1169
      break;
 
1170
    case DRIZZLE_TYPE_IPV6:
 
1171
      field_length= field::IPv6::max_string_length();
 
1172
      break;
1165
1173
    case DRIZZLE_TYPE_BOOLEAN:
1166
1174
      field_length= field::Boolean::max_string_length();
1167
1175
      break;
1221
1229
    case DRIZZLE_TYPE_LONGLONG:
1222
1230
    case DRIZZLE_TYPE_NULL:
1223
1231
    case DRIZZLE_TYPE_UUID:
 
1232
    case DRIZZLE_TYPE_IPV6:
1224
1233
    case DRIZZLE_TYPE_BOOLEAN:
1225
1234
      break;
1226
1235
    }
1929
1938
                                       null_pos,
1930
1939
                                       null_bit,
1931
1940
                                       field_name);
 
1941
  case DRIZZLE_TYPE_IPV6:
 
1942
    return new (&mem_root) field::IPv6(ptr,
 
1943
                                       field_length,
 
1944
                                       null_pos,
 
1945
                                       null_bit,
 
1946
                                       field_name);
1932
1947
  case DRIZZLE_TYPE_BOOLEAN:
1933
1948
    return new (&mem_root) field::Boolean(ptr,
1934
1949
                                          field_length,