← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
4136
4136
  case DRIZZLE_TYPE_DATETIME:
4137
4137
    field= new Field_datetime(maybe_null, name, &my_charset_bin);
4138
4138
    break;
4139
 
  case DRIZZLE_TYPE_YEAR:
4140
 
    field= new Field_year((uchar*) 0, max_length, null_ptr, 0, Field::NONE,
4141
 
                          name);
4142
 
    break;
4143
4139
  default:
4144
4140
    /* This case should never be chosen */
4145
4141
    assert(0);
4699
4695
    break;
4700
4696
  }
4701
4697
  case DRIZZLE_TYPE_SHORT:
4702
 
  case DRIZZLE_TYPE_YEAR:
4703
4698
  {
4704
4699
    int64_t nr;
4705
4700
    nr= val_int();
6383
6378
  case DRIZZLE_TYPE_TIMESTAMP:
6384
6379
  case DRIZZLE_TYPE_TIME:
6385
6380
  case DRIZZLE_TYPE_DATETIME:
6386
 
  case DRIZZLE_TYPE_YEAR:
6387
6381
  case DRIZZLE_TYPE_NEWDATE:
6388
6382
  case DRIZZLE_TYPE_VARCHAR:
6389
6383
  case DRIZZLE_TYPE_NEWDECIMAL: