← 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: Mark Atwood
  • Date: 2011-10-21 14:25:19 UTC
  • mfrom: (2440.2.28 rf)
  • Revision ID: me@mark.atwood.name-20111021142519-bqnyqrkthibv70rc
Tags: 2011.10.28
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_format.cc
388
388
  }
389
389
  else
390
390
  {
391
 
    String *res;
392
 
    if (!(res=args[0]->val_str(str)) ||
393
 
        (str_to_time_with_warn(&getSession(), res->ptr(), res->length(), &l_time)))
 
391
    String *res=args[0]->val_str(str);
 
392
    if (not res || str_to_time_with_warn(getSession(), *res, l_time))
394
393
      goto null_date;
395
394
 
396
395
    l_time.year=l_time.month=l_time.day=0;