← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-01-25 07:22:15 UTC
  • mfrom: (2109.1.7 drizzle-build)
  • Revision ID: brian@tangent.org-20110125072215-567z6uzy5vdvn4va
Merge in build/timestamp patches/fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/timestamp_diff.cc
34
34
  int neg= 1;
35
35
 
36
36
  null_value= 0;
37
 
  if (args[0]->get_date(&ltime1, TIME_NO_ZERO_DATE) ||
38
 
      args[1]->get_date(&ltime2, TIME_NO_ZERO_DATE))
 
37
  if (args[0]->get_date(ltime1, TIME_NO_ZERO_DATE) ||
 
38
      args[1]->get_date(ltime2, TIME_NO_ZERO_DATE))
39
39
    goto null_date;
40
40
 
41
41
  if (calc_time_diff(&ltime2,&ltime1, 1,