← 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

  • Committer: Brian Aker
  • Date: 2010-12-22 02:17:52 UTC
  • mfrom: (2016.1.7 clean)
  • mto: This revision was merged to the branch mainline in revision 2018.
  • Revision ID: brian@tangent.org-20101222021752-gmn5544aftbvwnls
Merge in code for time type, other cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_add_interval.cc
109
109
    return 0;
110
110
 
111
111
  if (ltime.time_type == DRIZZLE_TIMESTAMP_DATE)
 
112
  {
112
113
    make_date(&ltime, str);
 
114
  }
113
115
  else if (ltime.second_part)
114
116
  {
115
117
    /* Ensure we've got enough room for our timestamp string. */
127
129
    str->set_charset(&my_charset_bin);
128
130
  }
129
131
  else
 
132
  {
130
133
    make_datetime(&ltime, str);
 
134
  }
131
135
 
132
136
  return str;
133
137
}