← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/date_add_interval.cc

Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_add_interval.cc
115
115
 
116
116
  if (ltime.time_type == DRIZZLE_TIMESTAMP_DATE)
117
117
  {
118
 
    make_date(&ltime, str);
 
118
    ltime.convert(*str, DRIZZLE_TIMESTAMP_DATE);
119
119
  }
120
120
  else if (ltime.second_part)
121
121
  {
135
135
  }
136
136
  else
137
137
  {
138
 
    make_datetime(&ltime, str);
 
138
    ltime.convert(*str);
139
139
  }
140
140
 
141
141
  return str;