← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/add_time.h

Phase 1 - temporal changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/add_time.h
46
46
  my_decimal *val_decimal(my_decimal *decimal_value)
47
47
  {
48
48
    assert(fixed == 1);
49
 
    if (cached_field_type == DRIZZLE_TYPE_TIME)
50
 
      return  val_decimal_from_time(decimal_value);
51
49
    if (cached_field_type == DRIZZLE_TYPE_DATETIME)
52
50
      return  val_decimal_from_date(decimal_value);
53
51
    return Item_str_func::val_decimal(decimal_value);
54
52
  }
55
53
  int save_in_field(Field *field, bool no_conversions)
56
54
  {
57
 
    if (cached_field_type == DRIZZLE_TYPE_TIME)
58
 
      return save_time_in_field(field);
59
55
    if (cached_field_type == DRIZZLE_TYPE_DATETIME)
60
56
      return save_date_in_field(field);
61
57
    return Item_str_func::save_in_field(field, no_conversions);