← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

Phase 1 - temporal changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
47
47
#include <drizzled/field/long.h>
48
48
#include <drizzled/field/int64_t.h>
49
49
#include <drizzled/field/num.h>
50
 
#include <drizzled/field/timetype.h>
51
50
#include <drizzled/field/timestamp.h>
52
51
#include <drizzled/field/datetime.h>
53
52
#include <drizzled/field/varstring.h>
1497
1496
  case DRIZZLE_TYPE_DATE:
1498
1497
    field= new Field_date(maybe_null, name, &my_charset_bin);
1499
1498
    break;
1500
 
  case DRIZZLE_TYPE_TIME:
1501
 
    field= new Field_time(maybe_null, name, &my_charset_bin);
1502
 
    break;
1503
1499
  case DRIZZLE_TYPE_TIMESTAMP:
1504
1500
    field= new Field_timestamp(maybe_null, name, &my_charset_bin);
1505
1501
    break;
1652
1648
    }
1653
1649
    break;
1654
1650
  }
1655
 
  case DRIZZLE_TYPE_TIME:
1656
 
  {
1657
 
    DRIZZLE_TIME tm;
1658
 
    get_time(&tm);
1659
 
    if (!null_value)
1660
 
      result= protocol->store_time(&tm);
1661
 
    break;
1662
 
  }
1663
1651
  }
1664
1652
  if (null_value)
1665
1653
    result= protocol->store_null();
2002
1990
      To preserve type they needed to be handled separately.
2003
1991
    */
2004
1992
    if ((type= item->field_type()) == DRIZZLE_TYPE_DATETIME ||
2005
 
        type == DRIZZLE_TYPE_TIME || type == DRIZZLE_TYPE_DATE ||
 
1993
        type == DRIZZLE_TYPE_DATE ||
2006
1994
        type == DRIZZLE_TYPE_TIMESTAMP)
2007
1995
      new_field= item->tmp_table_field_from_field_type(table, 1);
2008
1996
    /*