← 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: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/date_format.cc
399
399
  {
400
400
    String *res;
401
401
    if (!(res=args[0]->val_str(str)) ||
402
 
        (str_to_time_with_warn(res->ptr(), res->length(), &l_time)))
 
402
        (str_to_time_with_warn(current_session, res->ptr(), res->length(), &l_time)))
403
403
      goto null_date;
404
404
 
405
405
    l_time.year=l_time.month=l_time.day=0;