← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: David Axmark
  • Date: 2008-11-05 05:50:56 UTC
  • mto: (584.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 586.
  • Revision ID: davida@davids-laptop-20081105055056-bt8ajhvihu0j28kp
Changed NEWDATE to DATE. One failing test but I think its somewhere else in the code 
(func_math).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
3985
3985
{
3986
3986
  switch (field_type())
3987
3987
  {
3988
 
    case DRIZZLE_TYPE_NEWDATE:
 
3988
    case DRIZZLE_TYPE_DATE:
3989
3989
    case DRIZZLE_TYPE_DATETIME:
3990
3990
    case DRIZZLE_TYPE_TIMESTAMP:
3991
3991
      return true;
4142
4142
    field= new Field_null((unsigned char*) 0, max_length, Field::NONE,
4143
4143
                          name, &my_charset_bin);
4144
4144
    break;
4145
 
  case DRIZZLE_TYPE_NEWDATE:
4146
 
    field= new Field_newdate(maybe_null, name, &my_charset_bin);
 
4145
  case DRIZZLE_TYPE_DATE:
 
4146
    field= new Field_date(maybe_null, name, &my_charset_bin);
4147
4147
    break;
4148
4148
  case DRIZZLE_TYPE_TIME:
4149
4149
    field= new Field_time(maybe_null, name, &my_charset_bin);
4721
4721
    get_date(&tm, TIME_FUZZY_DATE);
4722
4722
    if (!null_value)
4723
4723
    {
4724
 
      if (f_type == DRIZZLE_TYPE_NEWDATE)
 
4724
      if (f_type == DRIZZLE_TYPE_DATE)
4725
4725
        return protocol->store_date(&tm);
4726
4726
      else
4727
4727
        result= protocol->store(&tm);
6363
6363
  case DRIZZLE_TYPE_TIMESTAMP:
6364
6364
  case DRIZZLE_TYPE_TIME:
6365
6365
  case DRIZZLE_TYPE_DATETIME:
6366
 
  case DRIZZLE_TYPE_NEWDATE:
 
6366
  case DRIZZLE_TYPE_DATE:
6367
6367
  case DRIZZLE_TYPE_VARCHAR:
6368
6368
  case DRIZZLE_TYPE_NEWDECIMAL:
6369
6369
  case DRIZZLE_TYPE_ENUM: