← 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: Olaf van der Spek
  • Date: 2011-03-23 10:31:37 UTC
  • mto: (2247.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2248.
  • Revision ID: olafvdspek@gmail.com-20110323103137-lwevis2tfchgu18u
Propogate return void

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/timestamp_diff.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <config.h>
21
21
 
22
 
#include "drizzled/function/time/timestamp_diff.h"
23
 
#include "drizzled/time_functions.h"
 
22
#include <drizzled/function/time/timestamp_diff.h>
 
23
#include <drizzled/time_functions.h>
24
24
 
25
25
namespace drizzled
26
26
{
27
27
 
28
28
int64_t Item_func_timestamp_diff::val_int()
29
29
{
30
 
  DRIZZLE_TIME ltime1, ltime2;
 
30
  type::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,
130
130
}
131
131
 
132
132
 
133
 
void Item_func_timestamp_diff::print(String *str, enum_query_type query_type)
 
133
void Item_func_timestamp_diff::print(String *str)
134
134
{
135
135
  str->append(func_name());
136
136
  str->append('(');
170
170
  for (uint32_t i=0 ; i < 2 ; i++)
171
171
  {
172
172
    str->append(',');
173
 
    args[i]->print(str, query_type);
 
173
    args[i]->print(str);
174
174
  }
175
175
  str->append(')');
176
176
}