← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/mf_getdate.cc

  • Committer: Monty Taylor
  • Date: 2008-12-17 18:23:08 UTC
  • mfrom: (685.3.3 mysys-slimdown)
  • mto: This revision was merged to the branch mainline in revision 713.
  • Revision ID: monty@inaugust.com-20081217182308-bcuztplharskm9yh
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/mf_getdate.cc
43
43
  struct tm tm_tmp;
44
44
#endif
45
45
 
46
 
   skr=date ? (time_t) date : my_time(0);
 
46
   skr= date ? (time_t) date : time(0);
47
47
#if defined(HAVE_LOCALTIME_R) && defined(_REENTRANT)
48
48
   if (flag & GETDATE_GMT)
49
49
     localtime_r(&skr,&tm_tmp);