← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Monty Taylor
  • Date: 2008-11-15 17:58:57 UTC
  • mfrom: (575.5.1 drizzle)
  • mto: (589.1.3 devel)
  • mto: This revision was merged to the branch mainline in revision 586.
  • Revision ID: monty@inaugust.com-20081115175857-kxdeopxzbyyz5bkd
Merged from David.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
3970
3970
{
3971
3971
  switch (field_type())
3972
3972
  {
3973
 
    case DRIZZLE_TYPE_NEWDATE:
 
3973
    case DRIZZLE_TYPE_DATE:
3974
3974
    case DRIZZLE_TYPE_DATETIME:
3975
3975
    case DRIZZLE_TYPE_TIMESTAMP:
3976
3976
      return true;
4127
4127
    field= new Field_null((unsigned char*) 0, max_length, Field::NONE,
4128
4128
                          name, &my_charset_bin);
4129
4129
    break;
4130
 
  case DRIZZLE_TYPE_NEWDATE:
4131
 
    field= new Field_newdate(maybe_null, name, &my_charset_bin);
 
4130
  case DRIZZLE_TYPE_DATE:
 
4131
    field= new Field_date(maybe_null, name, &my_charset_bin);
4132
4132
    break;
4133
4133
  case DRIZZLE_TYPE_TIME:
4134
4134
    field= new Field_time(maybe_null, name, &my_charset_bin);
4697
4697
    get_date(&tm, TIME_FUZZY_DATE);
4698
4698
    if (!null_value)
4699
4699
    {
4700
 
      if (f_type == DRIZZLE_TYPE_NEWDATE)
 
4700
      if (f_type == DRIZZLE_TYPE_DATE)
4701
4701
        return protocol->store_date(&tm);
4702
4702
      else
4703
4703
        result= protocol->store(&tm);
6333
6333
  case DRIZZLE_TYPE_TIMESTAMP:
6334
6334
  case DRIZZLE_TYPE_TIME:
6335
6335
  case DRIZZLE_TYPE_DATETIME:
6336
 
  case DRIZZLE_TYPE_NEWDATE:
 
6336
  case DRIZZLE_TYPE_DATE:
6337
6337
  case DRIZZLE_TYPE_VARCHAR:
6338
6338
  case DRIZZLE_TYPE_NEWDECIMAL:
6339
6339
  case DRIZZLE_TYPE_ENUM:
6525
6525
      To preserve type they needed to be handled separately.
6526
6526
    */
6527
6527
    if ((type= item->field_type()) == DRIZZLE_TYPE_DATETIME ||
6528
 
        type == DRIZZLE_TYPE_TIME || type == DRIZZLE_TYPE_NEWDATE ||
 
6528
        type == DRIZZLE_TYPE_TIME || type == DRIZZLE_TYPE_DATE ||
6529
6529
        type == DRIZZLE_TYPE_TIMESTAMP)
6530
6530
      new_field= item->tmp_table_field_from_field_type(table, 1);
6531
6531
    /*