← 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: Monty Taylor
  • Date: 2010-12-22 03:15:22 UTC
  • mto: (2023.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2024.
  • Revision ID: mordred@inaugust.com-20101222031522-bmi73y3y00f480qs
Fixed some valgrind warning suppressions which were getting fooled by a
different stack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/timestamp_diff.cc
27
27
 
28
28
int64_t Item_func_timestamp_diff::val_int()
29
29
{
30
 
  type::Time ltime1, ltime2;
 
30
  DRIZZLE_TIME ltime1, ltime2;
31
31
  int64_t seconds;
32
32
  long microseconds;
33
33
  long months= 0;
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,