← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge Nathan

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/timestamp_diff.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
22
 
#include "drizzled/function/time/timestamp_diff.h"
23
 
#include "drizzled/time_functions.h"
24
 
 
25
 
namespace drizzled
26
 
{
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
 
22
#include <drizzled/function/time/timestamp_diff.h>
27
23
 
28
24
int64_t Item_func_timestamp_diff::val_int()
29
25
{
30
 
  type::Time ltime1, ltime2;
 
26
  DRIZZLE_TIME ltime1, ltime2;
31
27
  int64_t seconds;
32
28
  long microseconds;
33
29
  long months= 0;
34
30
  int neg= 1;
35
31
 
36
32
  null_value= 0;
37
 
  if (args[0]->get_date(ltime1, TIME_NO_ZERO_DATE) ||
38
 
      args[1]->get_date(ltime2, TIME_NO_ZERO_DATE))
 
33
  if (args[0]->get_date(&ltime1, TIME_NO_ZERO_DATE) ||
 
34
      args[1]->get_date(&ltime2, TIME_NO_ZERO_DATE))
39
35
    goto null_date;
40
36
 
41
37
  if (calc_time_diff(&ltime2,&ltime1, 1,
174
170
  }
175
171
  str->append(')');
176
172
}
177
 
 
178
 
} /* namespace drizzled */