← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-01-19 18:03:32 UTC
  • mfrom: (2088.8.12 timestamp)
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: brian@tangent.org-20110119180332-acfk5i8oofp63s40
Merge in time code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/makedate.cc
56
56
  {
57
57
    null_value=0;
58
58
    get_date_from_daynr(days,&l_time.year,&l_time.month,&l_time.day);
59
 
    if (str->alloc(MAX_DATE_STRING_REP_LENGTH))
 
59
    if (str->alloc(type::Time::MAX_STRING_LENGTH))
60
60
      goto err;
61
 
    make_date(&l_time, str);
 
61
 
 
62
    l_time.convert(*str, type::DRIZZLE_TIMESTAMP_DATE);
 
63
 
62
64
    return str;
63
65
  }
64
66