← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.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/item.cc
1178
1178
    break;
1179
1179
  case DRIZZLE_TYPE_BOOLEAN:
1180
1180
  case DRIZZLE_TYPE_UUID:
 
1181
  case DRIZZLE_TYPE_IPV6:
1181
1182
  case DRIZZLE_TYPE_ENUM:
1182
1183
  case DRIZZLE_TYPE_VARCHAR:
1183
1184
    return make_string_field(table);
1326
1327
  case DRIZZLE_TYPE_VARCHAR:
1327
1328
  case DRIZZLE_TYPE_BOOLEAN:
1328
1329
  case DRIZZLE_TYPE_UUID:
 
1330
  case DRIZZLE_TYPE_IPV6:
1329
1331
  case DRIZZLE_TYPE_DECIMAL:
1330
1332
    {
1331
1333
      if (String* res=val_str(buffer))