← 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: Lee Bieber
  • Date: 2010-11-07 19:34:48 UTC
  • mfrom: (1910.1.2 build)
  • Revision ID: kalebral@gmail.com-20101107193448-64kdu912qej354sh
Merge Stewart - including adapting and expanding the "differences from mysql" page from the wiki.
Merge Stewart - fix bug 668143: drizzleslap with --commit runs second iteration data load in a transaction

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
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,