← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-01-18 00:08:34 UTC
  • mto: (2097.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2098.
  • Revision ID: brian@tangent.org-20110118000834-a1p3mves421202oy
Fix additional output, swaps for the valus.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_format.cc
410
410
    goto null_date;
411
411
 
412
412
  if (fixed_length)
413
 
    size=max_length;
 
413
    size= max_length;
414
414
  else
415
 
    size=format_length(format);
 
415
    size= format_length(format);
416
416
 
417
 
  if (size < MAX_DATE_STRING_REP_LENGTH)
418
 
    size= MAX_DATE_STRING_REP_LENGTH;
 
417
  if (size < type::Time::MAX_STRING_LENGTH)
 
418
    size= type::Time::MAX_STRING_LENGTH;
419
419
 
420
420
  if (format == str)
421
421
    str= &value;                                // Save result here